svn commit: r290394 - in head: include sys/sys

[Pedro F. Giffuni]

Author: pfg
Date: Thu Nov  5 14:55:58 2015
New Revision: 290394
URL: https://svnweb.freebsd.org/changeset/base/290394

Log:
  Rename __sentinel to __null_sentinel
  
  GCC 5 uses a conflicting __sentinel definition in include/c++/bits/stl_algo.h
  
  Reported by:	matteo

Modified:
  head/include/unistd.h
  head/sys/sys/cdefs.h

Modified: head/include/unistd.h
==============================================================================
--- head/include/unistd.h	Thu Nov  5 14:37:17 2015	(r290393)
+++ head/include/unistd.h	Thu Nov  5 14:55:58 2015	(r290394)
@@ -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 *);

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Thu Nov  5 14:37:17 2015	(r290393)
+++ head/sys/sys/cdefs.h	Thu Nov  5 14:55:58 2015	(r290394)
@@ -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