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

Timestamp:

2010-04-04T22:07:05Z (14 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/inet.h (moved) (moved from uspace/srv/net/include/inet.h ) (3 diffs)

uspace/lib/socket/include/inet.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-#include "byteorder.h"
+#include <net_byteorder.h>
 
 /** Type definition of the socket address.
@@ -62 +62 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int inet_ntop(uint16_t family, const uint8_t * data, char * address, size_t length);
+extern int inet_ntop(uint16_t family, const uint8_t * data, char * address, size_t length);
 
 /** Parses the character string into the address.
@@ -74 +74 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int inet_pton(uint16_t family, const char * address, uint8_t * data);
+extern int inet_pton(uint16_t family, const char * address, uint8_t * data);
 
 /** Socket address.