Changeset f14291b in mainline for uspace/srv/net/il/ip/ip_local.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/srv/net/il/ip/ip_local.h (moved) (moved from uspace/lib/net/include/ip_local.h ) (1 diff)

uspace/srv/net/il/ip/ip_local.h

@@ -31 +31 @@
  */
 
-#ifndef __NET_IP_LOCAL_H__
-#define __NET_IP_LOCAL_H__
+#ifndef NET_IP_LOCAL_H_
+#define NET_IP_LOCAL_H_
 
 #include <async.h>
 #include <ipc/services.h>
 
-#include <ip_codes.h>
-#include <inet.h>
-#include <in.h>
-#include <socket.h>
+#include <net/ip_codes.h>
+#include <net/inet.h>
+#include <net/in.h>
 
 extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,