Changeset f14291b in mainline for uspace/lib/net/include/icmp_interface.h

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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/net/include/icmp_interface.h (modified) (1 diff)

uspace/lib/net/include/icmp_interface.h

@@ -34 +34 @@
 #define __NET_ICMP_INTERFACE_H__
 
+#include <net/socket_codes.h>
 #include <sys/types.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
-#include <inet.h>
-#include <ip_codes.h>
-#include <socket_codes.h>
-#include <icmp_codes.h>
-#include <icmp_common.h>
+#include <net/packet.h>
+#include <net/inet.h>
+#include <net/ip_codes.h>
+#include <net/icmp_codes.h>
+#include <net/icmp_common.h>
 
 /** @name ICMP module interface