public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Rename __sentinel to __null_sentinel
@ 2017-04-04  9:44 Corinna Vinschen
  0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2017-04-04  9:44 UTC (permalink / raw)
  To: newlib-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=086730fb14c1c4171764e605d7510e33f0fc34ed

commit 086730fb14c1c4171764e605d7510e33f0fc34ed
Author: pfg <pfg@FreeBSD.org>
Date:   Tue Apr 4 09:04:52 2017 +0200

    Rename __sentinel to __null_sentinel
    
    GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h
    
    Reported by:	matteo

Diff:
---
 newlib/libc/include/sys/cdefs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h
index f569fc4..1e3c6b0 100644
--- a/newlib/libc/include/sys/cdefs.h
+++ b/newlib/libc/include/sys/cdefs.h
@@ -464,7 +464,7 @@
 #endif
 
 #if __GNUC_PREREQ__(4, 0)
-#define	__sentinel	__attribute__((__sentinel__))
+#define	__null_sentinel	__attribute__((__sentinel__))
 #define	__exported	__attribute__((__visibility__("default")))
 /* Only default visibility is supported on PE/COFF targets. */
 #ifndef __CYGWIN__
@@ -473,7 +473,7 @@
 #define	__hidden
 #endif
 #else
-#define	__sentinel
+#define	__null_sentinel
 #define	__exported
 #define	__hidden
 #endif


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-04-04  9:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-04  9:44 [newlib-cygwin] Rename __sentinel to __null_sentinel Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).