Rename __sentinel to __null_sentinel

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

Reported by:	matteo
This commit is contained in:
pfg 2017-04-04 09:04:52 +02:00 committed by Corinna Vinschen
parent f70d9ae6ad
commit 086730fb14
1 changed files with 2 additions and 2 deletions

View File

@ -464,7 +464,7 @@
#endif #endif
#if __GNUC_PREREQ__(4, 0) #if __GNUC_PREREQ__(4, 0)
#define __sentinel __attribute__((__sentinel__)) #define __null_sentinel __attribute__((__sentinel__))
#define __exported __attribute__((__visibility__("default"))) #define __exported __attribute__((__visibility__("default")))
/* Only default visibility is supported on PE/COFF targets. */ /* Only default visibility is supported on PE/COFF targets. */
#ifndef __CYGWIN__ #ifndef __CYGWIN__
@ -473,7 +473,7 @@
#define __hidden #define __hidden
#endif #endif
#else #else
#define __sentinel #define __null_sentinel
#define __exported #define __exported
#define __hidden #define __hidden
#endif #endif