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-41-g3172b27


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  3172b27b2b3b0033e85ddf3566c7533a8f3b4bda (commit)
      from  4918e5f4cd63290bb0b2c614f52092ca6a779126 (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=3172b27b2b3b0033e85ddf3566c7533a8f3b4bda

commit 3172b27b2b3b0033e85ddf3566c7533a8f3b4bda
Author: Wilco Dijkstra <wdijkstr@arm.com>
Date:   Wed Feb 15 15:13:58 2017 +0000

    The internal header include/string.h does not work in C++: it causes link errors
    in several C++ debug tests when any of the functions it declares are called.
    The best option would be to not use internal headers for tests (unless
    explicitly needed).  Add guards so that it is safe to use include/string.h from
    C++.
    
    	* include/string.h: Add __cplusplus check.

diff --git a/ChangeLog b/ChangeLog
index 62961a2..caf784e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-15  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* include/string.h: Add __cplusplus check.
+
 2017-02-15  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	[BZ #21134]
diff --git a/include/string.h b/include/string.h
index 07389f3..45eca3c 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,6 +1,6 @@
 #ifndef _STRING_H
 
-#ifndef _ISOMAC
+#if !defined _ISOMAC && !defined __cplusplus
 #include <sys/types.h>
 
 extern void *__memccpy (void *__dest, const void *__src,
@@ -53,7 +53,7 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
    above are defined as macros in the headers.  */
 #include <string/string.h>
 
-#ifndef _ISOMAC
+#if !defined _ISOMAC && !defined __cplusplus
 extern __typeof (strcoll_l) __strcoll_l;
 extern __typeof (strxfrm_l) __strxfrm_l;
 extern __typeof (strcasecmp_l) __strcasecmp_l;

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

Summary of changes:
 ChangeLog        |    4 ++++
 include/string.h |    4 ++--
 2 files changed, 6 insertions(+), 2 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]