diff options
Diffstat (limited to 'stdlib/stdlib.h')
| -rw-r--r-- | stdlib/stdlib.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 75750205c8..d1f3841f1b 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -497,8 +497,8 @@ extern void cfree (void *__ptr) __THROW; # include <alloca.h> #endif /* Use GNU, BSD, or misc. */ -#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \ - && !defined __USE_XOPEN2K) || defined __USE_GNU +#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \ + || defined __USE_BSD /* Allocate SIZE bytes on a page boundary. The storage cannot be freed. */ extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur; #endif @@ -586,7 +586,7 @@ extern int setenv (__const char *__name, __const char *__value, int __replace) __THROW __nonnull ((2)); /* Remove the variable NAME from the environment. */ -extern int unsetenv (__const char *__name) __THROW; +extern int unsetenv (__const char *__name) __THROW __nonnull ((1)); #endif #ifdef __USE_MISC @@ -597,8 +597,8 @@ extern int clearenv (void) __THROW; #endif -#if ((defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \ - && !defined __USE_XOPEN2K) || defined __USE_GNU +#if defined __USE_MISC \ + || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) /* 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 file name unique. @@ -797,8 +797,8 @@ __END_NAMESPACE_C99 #endif -#if ((defined __USE_SVID || defined __USE_XOPEN_EXTENDED) \ - && !defined __USE_XOPEN2K) || defined __USE_GNU +#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \ + || defined __USE_SVID /* Convert floating point numbers to strings. The returned values are valid only until another call to the same function. */ |