aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-06 22:27:07 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-06 22:27:07 +0000
commit544e1130dffcf81e1a61d28f0849eb3b105f6a35 (patch)
tree9ddccf1027b45ea3fcffa3748d7b9edc30f86afc
parent5ab1c0338141dae86d5490ce448446ab7534ee8f (diff)
downloadglibc-544e1130dffcf81e1a61d28f0849eb3b105f6a35.zip
glibc-544e1130dffcf81e1a61d28f0849eb3b105f6a35.tar.gz
glibc-544e1130dffcf81e1a61d28f0849eb3b105f6a35.tar.bz2
Update.
* string/string-inlines.c: Undefined __USE_STRING_INLINES before defining it.
-rw-r--r--ChangeLog3
-rw-r--r--inet/tst-ipnode.c4
-rw-r--r--string/string-inlines.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d49c23c..3606f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1999-08-06 Ulrich Drepper <drepper@cygnus.com>
+ * string/string-inlines.c: Undefined __USE_STRING_INLINES before
+ defining it.
+
* inet/Makefile (tests): Add tst-ipnode.
* inet/tst-ipnode.c: New file.
diff --git a/inet/tst-ipnode.c b/inet/tst-ipnode.c
index b8b1e77..ad3a7e7 100644
--- a/inet/tst-ipnode.c
+++ b/inet/tst-ipnode.c
@@ -1,5 +1,6 @@
#include <netdb.h>
#include <stdio.h>
+#include <netinet/in.h>
/* The unspecified IPv6 address. */
struct in6_addr anyv6 = IN6ADDR_ANY_INIT;
@@ -12,7 +13,8 @@ main (void)
/* Test the unspecifed IPv6 address. */
errval = 0x3453456;
- if (getipnodebyaddr (&anyv6, sizeof (anyv6), AF_INET6, &errval) != NULL
+ if (getipnodebyaddr ((char *) &anyv6, sizeof (anyv6), AF_INET6, &errval)
+ != NULL
|| errval != HOST_NOT_FOUND)
{
puts ("getipnodenyaddr(in6addr_any,...) != NULL");
diff --git a/string/string-inlines.c b/string/string-inlines.c
index 6406ba3..7759dbc 100644
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -20,9 +20,9 @@
functions. These functions are declared additionally here if
inlining is not possible. */
+#undef __USE_STRING_INLINES
#define __USE_STRING_INLINES
#define _FORCE_INLINES
#define __STRING_INLINE /* empty */
#include <string.h>
-