From: pfg <pfg@FreeBSD.org>
Date: Tue, 4 Apr 2017 07:04:52 +0000 (+0200)
Subject: Rename __sentinel to __null_sentinel
X-Git-Tag: newlib-snapshot-20170421~31
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=086730fb14c1c4171764e605d7510e33f0fc34ed;p=newlib-cygwin.git

Rename __sentinel to __null_sentinel

GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h

Reported by:	matteo
---

diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h
index f569fc4d0..1e3c6b043 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