This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.25-460-g4bad368


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  4bad368d9f13c2d8b8d2b2cea89a61916223d882 (commit)
      from  3c023dbf5780f5afe8a5ea8e17667719307d955f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4bad368d9f13c2d8b8d2b2cea89a61916223d882

commit 4bad368d9f13c2d8b8d2b2cea89a61916223d882
Author: Wilco Dijkstra <wdijkstr@arm.com>
Date:   Mon Jun 12 19:48:31 2017 +0100

    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.

diff --git a/ChangeLog b/ChangeLog
index c4cfaf6..0a21fa5 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 55c9984..9f14536 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>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    4 ++++
 string/string-inlines.c |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]