Changeset 59ecd4a in mainline for uspace/lib/socket/packet/packet.c

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/lib/socket/packet/packet.c (moved) (moved from uspace/srv/net/structures/packet/packet.c ) (1 diff)

uspace/lib/socket/packet/packet.c

@@ -40 +40 @@
 #include <mem.h>
 #include <fibril_synch.h>
-//#include <stdio.h>
 #include <unistd.h>
 
 #include <sys/mman.h>
 
-#include "../../err.h"
-
-#include "../generic_field.h"
-
-#include "packet.h"
-#include "packet_header.h"
+#include <net_err.h>
+#include <adt/generic_field.h>
+#include <packet/packet.h>
+#include <packet/packet_header.h>
 
 /** Packet map page size.