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:
parent
d5b4f139f5
commit
96a8bf8fbf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=290394
@ -327,9 +327,9 @@ int close(int);
|
|||||||
void closefrom(int);
|
void closefrom(int);
|
||||||
int dup(int);
|
int dup(int);
|
||||||
int dup2(int, int);
|
int dup2(int, int);
|
||||||
int execl(const char *, const char *, ...) __sentinel;
|
int execl(const char *, const char *, ...) __null_sentinel;
|
||||||
int execle(const char *, const char *, ...);
|
int execle(const char *, const char *, ...);
|
||||||
int execlp(const char *, const char *, ...) __sentinel;
|
int execlp(const char *, const char *, ...) __null_sentinel;
|
||||||
int execv(const char *, char * const *);
|
int execv(const char *, char * const *);
|
||||||
int execve(const char *, char * const *, char * const *);
|
int execve(const char *, char * const *, char * const *);
|
||||||
int execvp(const char *, char * const *);
|
int execvp(const char *, char * const *);
|
||||||
|
@ -459,11 +459,11 @@
|
|||||||
#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")))
|
||||||
#define __hidden __attribute__((__visibility__("hidden")))
|
#define __hidden __attribute__((__visibility__("hidden")))
|
||||||
#else
|
#else
|
||||||
#define __sentinel
|
#define __null_sentinel
|
||||||
#define __exported
|
#define __exported
|
||||||
#define __hidden
|
#define __hidden
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user