jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename __sentinel to __null_sentinel

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

Reported by:	matteo
This commit is contained in:
Pedro F. Giffuni 2015-11-05 14:55:58 +00:00
parent d5b4f139f5
commit 96a8bf8fbf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290394
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/unistd.h
View File

@ -327,9 +327,9 @@ int close(int);
void closefrom(int);
int dup(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 execlp(const char *, const char *, ...) __sentinel;
int execlp(const char *, const char *, ...) __null_sentinel;
int execv(const char *, char * const *);
int execve(const char *, char * const *, char * const *);
int execvp(const char *, char * const *);

4
sys/sys/cdefs.h
View File

@ -459,11 +459,11 @@
#endif
#if __GNUC_PREREQ__(4, 0)
#define __sentinel __attribute__((__sentinel__))
#define __null_sentinel __attribute__((__sentinel__))
#define __exported __attribute__((__visibility__("default")))
#define __hidden __attribute__((__visibility__("hidden")))
#else
#define __sentinel
#define __null_sentinel
#define __exported
#define __hidden
#endif