about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDenis Zaitceff <zaitceff@gmail.com>2011-09-09 12:45:03 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-09 12:45:03 -0400
commitf3cdd4674892740f766ea0b5ab5e734e4a028cb0 (patch)
tree25667bdc3faf16e9d9c4f5458b5018559beb8ef2
parent633e9e0fc2aef7d6882b1e699174120117bd66ea (diff)
downloadglibc-f3cdd4674892740f766ea0b5ab5e734e4a028cb0.tar.gz
glibc-f3cdd4674892740f766ea0b5ab5e734e4a028cb0.tar.xz
glibc-f3cdd4674892740f766ea0b5ab5e734e4a028cb0.zip
string/strncat.c: fix compilation for some architectures
-rw-r--r--ChangeLog5
-rw-r--r--string/strncat.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a41461dafc..007b61cde3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
+
+	* string/strncat.c (strncat): Undef the symbol in case it has been
+	defined in bits/string.h.
+
 2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 
 	* elf/sotruss.ksh: Clean up, fix, and complete help messages.
diff --git a/string/strncat.c b/string/strncat.c
index 0a3d4af709..bf6f99b277 100644
--- a/string/strncat.c
+++ b/string/strncat.c
@@ -25,6 +25,7 @@ typedef char reg_char;
 #endif
 
 #ifndef STRNCAT
+# undef strncat
 # define STRNCAT  strncat
 #endif