Changeset 4c53333 in mainline for uspace/srv/net/inetsrv/pdu.h

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/inetsrv/pdu.h (moved) (moved from uspace/srv/net/inet/pdu.h ) (2 diffs)

uspace/srv/net/inetsrv/pdu.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 #define INET_CHECKSUM_INIT 0xffff
@@ -48 +48 @@
     size_t *, size_t *);
 extern int inet_pdu_decode(void *, size_t, inet_packet_t *);
+extern int inet_pdu_decode6(void *, size_t, inet_packet_t *);
 
 #endif