Changeset 3aae4e8 in mainline for uspace/lib/socket/include/icmp_api.h

Timestamp:

2010-04-04T22:07:05Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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/socket/include/icmp_api.h (moved) (moved from uspace/srv/net/include/icmp_api.h ) (2 diffs)

uspace/lib/socket/include/icmp_api.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-#include "device.h"
-
-#include "../structures/measured_strings.h"
-#include "../structures/packet/packet.h"
-
-#include "inet.h"
-#include "ip_codes.h"
-#include "socket_codes.h"
-
-#include "icmp_codes.h"
-#include "icmp_common.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>
 
 /** Miliseconds type definition.
@@ -79 +76 @@
  *  @returns EPARTY if there was an internal error.
  */
-int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen);
+extern int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen);
 
 /*@}*/