summaryrefslogtreecommitdiffstats
path: root/libc/inet/addr.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-12-02 00:41:37 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-12-02 00:41:37 +0000
commit9acef89e60381a298801e4b221d66b1538072b28 (patch)
tree76643b24b4f8fc6590e392672102e5b30499ba73 /libc/inet/addr.c
parenta4a74b5760c426cede2ef36d35cb873f98b9f17b (diff)
downloaduClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.bz2
uClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.xz
Merge from trunk. More to come you betcha'.
Diffstat (limited to 'libc/inet/addr.c')
-rw-r--r--libc/inet/addr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index 5c4005a18..a03b7575b 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -16,6 +16,10 @@
* Changed to use _int10tostr.
*/
+#define _uintmaxtostr __libc__uintmaxtostr
+/* for some reason this does not work here */
+#define memmove __memmove
+
#define _GNU_SOURCE
#define __FORCE_GLIBC
#include <features.h>
@@ -142,7 +146,7 @@ char *inet_ntoa(struct in_addr in)
* Formulate an Internet address from network + host. Used in
* building addresses stored in the ifnet structure.
*/
-struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
+struct in_addr attribute_hidden __inet_makeaddr(in_addr_t net, in_addr_t host)
{
in_addr_t addr;
@@ -157,6 +161,7 @@ struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
addr = htonl(addr);
return (*(struct in_addr *)&addr);
}
+strong_alias(__inet_makeaddr,inet_makeaddr)
#endif