From: Andreas Schwab <schwab@suse.de>
Date: Thu, 12 Jun 2014 12:42:57 +0000 (+0200)
Subject: Update feature guard for strdup/strndup in <bits/string2.h>
X-Git-Tag: glibc-2.20~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e;p=thirdparty%2Fglibc.git

Update feature guard for strdup/strndup in <bits/string2.h>
---

diff --git a/ChangeLog b/ChangeLog
index 3e519fd0f81..ccc05a387ba 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 1b6a1ef9740..0523a273aa8 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