diff options
| author | pfg <pfg@FreeBSD.org> | 2015-11-05 14:55:58 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2015-11-05 14:55:58 +0000 |
| commit | e73a610f276e47e6461b26d590bfa1999ab437d3 (patch) | |
| tree | 6a60ed7398be0e6c48f5ba27c9c78c2a6a125e50 /include | |
| parent | 8705798e9f594b9460726b6904979aafa068644d (diff) | |
| download | FreeBSD-src-e73a610f276e47e6461b26d590bfa1999ab437d3.zip FreeBSD-src-e73a610f276e47e6461b26d590bfa1999ab437d3.tar.gz | |
Rename __sentinel to __null_sentinel
GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h
Reported by: matteo
Diffstat (limited to 'include')
| -rw-r--r-- | include/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/unistd.h b/include/unistd.h index ef77133..4c26a04 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -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 *); |
