diff options
| author | pfg <pfg@FreeBSD.org> | 2017-04-04 09:04:52 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-04-04 11:41:13 +0200 |
| commit | 086730fb14c1c4171764e605d7510e33f0fc34ed (patch) | |
| tree | 57239df56f0698084d8eeb1722ee035b22f2da5e | |
| parent | f70d9ae6adc6ed7952806056349ba9f8ba3c65c8 (diff) | |
| download | cygnal-086730fb14c1c4171764e605d7510e33f0fc34ed.tar.gz cygnal-086730fb14c1c4171764e605d7510e33f0fc34ed.tar.bz2 cygnal-086730fb14c1c4171764e605d7510e33f0fc34ed.zip | |
Rename __sentinel to __null_sentinel
GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h
Reported by: matteo
| -rw-r--r-- | newlib/libc/include/sys/cdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |