diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-02-21 21:45:26 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-02-21 21:45:26 +0000 |
commit | acd7f096d79c181866d56d4aaf3b043e741f1e2c (patch) | |
tree | 94c060877bad764909f81a59eed8e62a17b84576 /stdlib/stdlib.h | |
parent | a5d82e4e34d627f6347b8dbd79046db7df5f93b6 (diff) | |
download | glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.zip glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.tar.gz glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.tar.bz2 |
Complete _BSD_SOURCE / _SVID_source followup cleanup.
This patch completes the headers cleanup consequent on removal of
_BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations):
* #endif conditionals that referred to BSD or SVID are updated.
* Redundant __USE_* tests in cases involving __USE_MISC are removed.
This includes cases such as __USE_MISC || __USE_ISOC99, where
__USE_MISC is redundant (because __USE_MISC is only ever defined in
the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99
is also defined; the same applies to the non-XSI-extended POSIX
versions), and cases involving __USE_GNU, where __USE_GNU is
redundant (because if __USE_GNU is defined, so are the other __USE_*
macros). There may well be other cases of __USE_FOO || __USE_BAR
tests that could be simplified because one macro implies the other;
this patch only addresses cases involving __USE_MISC.
Tested x86_64.
* bits/fcntl.h [__USE_MISC]: Remove redundant conditionals.
* bits/sigaction.h [__USE_MISC]: Likewise.
* bits/waitstatus.h: Update #endif comments.
* ctype/ctype.h: Likewise.
* dirent/dirent.h: Likewise.
[__USE_MISC]: Remove redundant conditionals.
* grp/grp.h: Update #endif comments.
[__USE_GNU]: Remove redundant conditionals.
[__USE_MISC]: Likewise.
* inet/netinet/in.h [__USE_GNU]: Likewise.
* io/sys/stat.h [__USE_MISC]: Likewise.
* libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise.
* libio/bits/stdio.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* libio/bits/stdio2.h [__USE_MISC]: Likewise.
* libio/stdio.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* math/bits/math-finite.h [__USE_MISC]: Likewise.
* math/bits/mathcalls.h [__USE_MISC]: Likewise.
* math/math.h: Update #else and #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* misc/sys/uio.h: Update #endif comments.
* posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals.
* posix/glob.h [__USE_MISC]: Likewise.
* posix/sys/types.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* posix/sys/wait.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* posix/unistd.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* pwd/pwd.h [__USE_GNU]: Likewise.
[__USE_MISC]: Likewise.
* resolv/netdb.h [__USE_GNU]: Likewise.
* signal/signal.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* stdlib/stdlib.h: Update #else and #endif comments.
[__USE_MISC]: Remove redundant conditionals.
[__USE_GNU]: Likewise.
* string/bits/string2.h [__USE_MISC]: Likewise.
* string/string.h: Update #endif comments.
[__USE_MISC]: Remove redundant conditionals.
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]:
Likewise.
* sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise.
* sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif
comments.
[__USE_MISC]: Remove redundant conditionals.
* sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise.
* sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]:
Likewise.
* sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise.
* sysdeps/x86/bits/string.h: Update #endif comments.
* sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant
conditionals.
* time/sys/time.h: Update #endif comments.
* time/time.h: Likewise.
[__USE_MISC]: Remove redundant conditionals.
Diffstat (limited to 'stdlib/stdlib.h')
-rw-r--r-- | stdlib/stdlib.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 20b79a7..00329a2 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -72,13 +72,13 @@ typedef union # define __WAIT_STATUS_DEFN int * # endif -# else /* Don't use BSD. */ +# else /* Don't use misc. */ # define __WAIT_INT(status) (status) # define __WAIT_STATUS int * # define __WAIT_STATUS_DEFN int * -# endif /* Use BSD. */ +# endif /* Use misc. */ /* Define the macros <sys/wait.h> also would define this way. */ # define WEXITSTATUS(status) __WEXITSTATUS (__WAIT_INT (status)) @@ -151,7 +151,7 @@ extern long int atol (const char *__nptr) __THROW __attribute_pure__ __nonnull ((1)) __wur; __END_NAMESPACE_STD -#if defined __USE_ISOC99 || defined __USE_MISC +#ifdef __USE_ISOC99 __BEGIN_NAMESPACE_C99 /* Convert a string to a long long integer. */ __extension__ extern long long int atoll (const char *__nptr) @@ -200,9 +200,9 @@ __extension__ extern unsigned long long int strtouq (const char *__restrict __nptr, char **__restrict __endptr, int __base) __THROW __nonnull ((1)); -#endif /* Use BSD. */ +#endif /* Use misc. */ -#if defined __USE_ISOC99 || defined __USE_MISC +#ifdef __USE_ISOC99 __BEGIN_NAMESPACE_C99 /* Convert a string to a quadword integer. */ __extension__ @@ -286,7 +286,7 @@ __NTH (atol (const char *__nptr)) } __END_NAMESPACE_STD -# if defined __USE_MISC || defined __USE_ISOC99 +# ifdef __USE_ISOC99 __BEGIN_NAMESPACE_C99 __extension__ __extern_inline long long int __NTH (atoll (const char *__nptr)) @@ -308,7 +308,7 @@ extern char *l64a (long int __n) __THROW __wur; extern long int a64l (const char *__s) __THROW __attribute_pure__ __nonnull ((1)) __wur; -#endif /* Use SVID || extended X/Open. */ +#endif /* Use misc || extended X/Open. */ #if defined __USE_MISC || defined __USE_XOPEN_EXTENDED # include <sys/types.h> /* we need int32_t... */ @@ -366,7 +366,7 @@ extern int setstate_r (char *__restrict __statebuf, struct random_data *__restrict __buf) __THROW __nonnull ((1, 2)); # endif /* Use misc. */ -#endif /* Use SVID || extended X/Open || BSD. */ +#endif /* Use extended X/Open || misc. */ __BEGIN_NAMESPACE_STD @@ -455,7 +455,7 @@ extern int lcong48_r (unsigned short int __param[7], struct drand48_data *__buffer) __THROW __nonnull ((1, 2)); # endif /* Use misc. */ -#endif /* Use SVID or X/Open. */ +#endif /* Use misc or X/Open. */ #endif /* don't just need malloc and calloc */ @@ -488,9 +488,9 @@ __END_NAMESPACE_STD extern void cfree (void *__ptr) __THROW; #endif /* Use misc. */ -#if defined __USE_GNU || defined __USE_MISC +#ifdef __USE_MISC # include <alloca.h> -#endif /* Use GNU, BSD, or misc. */ +#endif /* Use misc. */ #if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \ || defined __USE_MISC @@ -578,7 +578,7 @@ extern char *secure_getenv (const char *__name) extern int putenv (char *__string) __THROW __nonnull ((1)); #endif -#if defined __USE_MISC || defined __USE_XOPEN2K +#ifdef __USE_XOPEN2K /* Set NAME to VALUE in the environment. If REPLACE is nonzero, overwrite an existing value. */ extern int setenv (const char *__name, const char *__value, int __replace) @@ -606,8 +606,7 @@ extern int clearenv (void) __THROW; extern char *mktemp (char *__template) __THROW __nonnull ((1)); #endif -#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \ - || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* Generate a unique temporary file name from TEMPLATE. The last six characters of TEMPLATE must be "XXXXXX"; they are replaced with a string that makes the filename unique. @@ -654,7 +653,7 @@ extern int mkstemps64 (char *__template, int __suffixlen) # endif #endif -#if defined __USE_MISC || defined __USE_XOPEN2K8 +#ifdef __USE_XOPEN2K8 /* Create a unique temporary directory from TEMPLATE. The last six characters of TEMPLATE must be "XXXXXX"; they are replaced with a string that makes the directory name unique. |