about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2014-06-12 14:42:57 +0200
committerAndreas Schwab <schwab@suse.de>2014-06-16 10:21:31 +0200
commit3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e (patch)
treed4dad4402d126e2aab965272ad6347cb61be6457
parent6957fb3150410b3b64fd508901b5e006173156b4 (diff)
downloadglibc-3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e.tar.gz
glibc-3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e.tar.xz
glibc-3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e.zip
Update feature guard for strdup/strndup in <bits/string2.h>
-rw-r--r--ChangeLog4
-rw-r--r--string/bits/string2.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e519fd0f8..ccc05a387b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16  Andreas Schwab  <schwab@suse.de>
+
+	* string/bits/string2.h (strdup, strndup): Update feature guard.
+
 2014-06-14  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/fpu/libm-test-ulps: Update.
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 1b6a1ef974..0523a273aa 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1287,7 +1287,7 @@ extern char *__strdup (const char *__string) __THROW __attribute_malloc__;
 			  __retval; }))					      \
 		  : __strdup (s)))
 
-#  if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+#  if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 #   define strdup(s) __strdup (s)
 #  endif
 # endif
@@ -1315,7 +1315,7 @@ extern char *__strndup (const char *__string, size_t __n)
 			  __retval; }))					      \
 		  : __strndup (s, n)))
 
-#  ifdef __USE_GNU
+#  ifdef __USE_XOPEN2K8
 #   define strndup(s, n) __strndup (s, n)
 #  endif
 # endif