From 96a8bf8fbf6b10029d4cc496196b41206bbf321d Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 5 Nov 2015 14:55:58 +0000 Subject: [PATCH] Rename __sentinel to __null_sentinel GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h Reported by: matteo --- include/unistd.h | 4 ++-- sys/sys/cdefs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index ef77133d0ba5..4c26a042674e 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 *); diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 3eaf17bac2bf..59cc45f0e5fa 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -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