Changeset 3aae4e8 in mainline for uspace/lib/socket/include/adt/generic_char_map.h

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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/include/adt/generic_char_map.h (moved) (moved from uspace/srv/net/structures/generic_char_map.h ) (1 diff)

uspace/lib/socket/include/adt/generic_char_map.h

@@ -41 +41 @@
 #include <unistd.h>
 
-#include "../err.h"
+#include <net_err.h>
 
-#include "char_map.h"
-#include "generic_field.h"
+#include <adt/char_map.h>
+#include <adt/generic_field.h>
 
 /** Internal magic value for a&nbsp;map consistency check.