summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2017-06-12 19:48:31 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2017-06-12 19:59:09 +0100
commit4bad368d9f13c2d8b8d2b2cea89a61916223d882 (patch)
tree5dea1e84719a957ce119b87facfe9eaf6a78deb6
parent3c023dbf5780f5afe8a5ea8e17667719307d955f (diff)
downloadglibc-4bad368d9f13c2d8b8d2b2cea89a61916223d882.tar.gz
glibc-4bad368d9f13c2d8b8d2b2cea89a61916223d882.tar.xz
glibc-4bad368d9f13c2d8b8d2b2cea89a61916223d882.zip
Fix build issue on x86.
Add an undef of __stpcpy in string-inlines.c to avoid a redefinition
error on x86.

	* string/string-inlines.c: Add undef of __stpcpy to fix build issue.
-rw-r--r--ChangeLog4
-rw-r--r--string/string-inlines.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c4cfaf64d7..0a21fa51f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,6 +124,10 @@
 
 2017-06-12  Wilco Dijkstra  <wdijkstr@arm.com>
 
+	* string/string-inlines.c: Add undef of __stpcpy to fix build issue.
+
+2017-06-12  Wilco Dijkstra  <wdijkstr@arm.com>
+
 	[BZ #15105]
 	[BZ #19463]
 	* include/string.h: Add internal redirect for __stpcpy.
diff --git a/string/string-inlines.c b/string/string-inlines.c
index 55c99845aa..9f145366b6 100644
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #undef index
 #undef rindex
+#undef __stpcpy
 
 #undef __NO_INLINE__
 #include <bits/string.h>