Changeset 4687a26c in mainline for uspace/lib/c/generic/net/socket_parse.c

Timestamp:

2010-11-02T18:29:01Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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/c/generic/net/socket_parse.c (moved) (moved from uspace/lib/socket/generic/socket_parse.c ) (1 diff)

uspace/lib/c/generic/net/socket_parse.c

@@ -35 +35 @@
  */
 
-#include <socket_parse.h>
+#include <net/socket_parse.h>
+#include <net/socket.h>
 #include <arg_parse.h>
 #include <errno.h>
 #include <str.h>
-#include <socket.h>
 
 /** Translate the character string to the address family number.