Changeset 4687a26c in mainline for uspace/app/nettest1/nettest1.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/app/nettest1/nettest1.c (modified) (1 diff)

uspace/app/nettest1/nettest1.c

@@ -41 +41 @@
 #include <time.h>
 #include <arg_parse.h>
-
-#include <in.h>
-#include <in6.h>
-#include <inet.h>
-#include <socket.h>
-#include <net_err.h>
-#include <socket_parse.h>
+#include <err.h>
+
+#include <net/in.h>
+#include <net/in6.h>
+#include <net/inet.h>
+#include <net/socket.h>
+#include <net/socket_parse.h>
 
 #include "nettest.h"