Changeset ec1bdc8 in mainline for uspace/lib/socket/generic/socket_core.c

Timestamp:

2010-09-26T18:57:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3fe57ea7

Parents:

2a786f9 (diff), 70ce016 (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 from lp:~jakub/helenos/net.

File:

• uspace/lib/socket/generic/socket_core.c (modified) (1 diff)

uspace/lib/socket/generic/socket_core.c

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdlib.h>
-
-#include <net_err.h>
+#include <errno.h>
+#include <err.h>
+
 #include <in.h>
 #include <inet.h>
 #include <socket_codes.h>
-#include <socket_errno.h>
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>