From ab8f6a6e42ff893041f7545a23e6d6a0edde07fb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 10 Sep 2014 12:27:33 -0400 Subject: [PATCH] fix places where _BSD_SOURCE failed to yield a superset of _XOPEN_SOURCE the vast majority of these failures seem to have been oversights at the time _BSD_SOURCE was added, or perhaps shortly afterward. the one which may have had some reason behind it is omission of setpgrp from the _BSD_SOURCE feature profile, since the standard setpgrp interface conflicts with a legacy (pre-POSIX) BSD interface by the same name. however, such omission is not aligned with our general policy in this area (for example, handling of similar _GNU_SOURCE cases) and should not be preserved. --- include/signal.h | 2 +- include/stdlib.h | 3 --- include/time.h | 2 +- include/unistd.h | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/signal.h b/include/signal.h index c36e4d59..87301ba3 100644 --- a/include/signal.h +++ b/include/signal.h @@ -196,7 +196,7 @@ void psignal(int, const char *); #endif -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) +#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) int killpg(pid_t, int); int sigaltstack(const stack_t *__restrict, stack_t *__restrict); int sighold(int); diff --git a/include/stdlib.h b/include/stdlib.h index db569d97..97ce5a72 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -114,9 +114,6 @@ long int random (void); void srandom (unsigned int); char *initstate (unsigned int, char *, size_t); char *setstate (char *); -#endif - -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) int putenv (char *); int posix_openpt (int); int grantpt (int); diff --git a/include/time.h b/include/time.h index 6124ef1e..16ec08ae 100644 --- a/include/time.h +++ b/include/time.h @@ -116,7 +116,7 @@ int timer_getoverrun (timer_t); #endif -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) +#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict); extern int daylight; extern long timezone; diff --git a/include/unistd.h b/include/unistd.h index ac6055a5..0fe75d52 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -140,9 +140,6 @@ int lockf(int, int, off_t); long gethostid(void); int nice(int); void sync(void); -#endif - -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) pid_t setpgrp(void); char *crypt(const char *, const char *); void encrypt(char *, int); -- 2.25.1