summary refs log tree commit diff
diff options
context:
space:
mode:
-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>