Fix handling symbols removed in XPG7.

3 files changed, 15 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a90a9499b..5ffe09a3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/stdlib.h: Fix handling symbols removed in XPG7.
+	* posix/unistd.h: Likewise.
+
 	* posix/unistd.h: Include environments.h also for XPG6 and up.
 	Define intptr_t for XPG6 and up.
 	Fix up for XPG7.
diff --git a/posix/unistd.h b/posix/unistd.h
index ae997adc63..d8697553a7 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -440,8 +440,8 @@ extern unsigned int alarm (unsigned int __seconds) __THROW;
    __THROW.  */
 extern unsigned int sleep (unsigned int __seconds);
 
-#if (defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \
-    && !defined __USE_XOPEN2K8
+#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K8) || defined __USE_GNU
 /* Set an alarm to go off (generating a SIGALRM signal) in VALUE
    microseconds.  If INTERVAL is nonzero, when the alarm goes off, the
    timer is reset to go off every INTERVAL microseconds thereafter.
@@ -514,8 +514,8 @@ extern char *getcwd (char *__buf, size_t __size) __THROW __wur;
 extern char *get_current_dir_name (void) __THROW;
 #endif
 
-#if (defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \
-    && !defined __USE_XOPEN2K8
+#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K8) || defined __USE_GNU
 /* Put the absolute pathname of the current working directory in BUF.
    If successful, return BUF.  If not, put an error message in
    BUF and return NULL.  BUF should be at least PATH_MAX bytes long.  */
@@ -774,8 +774,8 @@ extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid)
    and the process ID of the new process to the old process.  */
 extern __pid_t fork (void) __THROW;
 
-#if (defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \
-    && !defined __USE_XOPEN2K8
+#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K8) || defined __USE_GNU
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 8669f35d76..75750205c8 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
+#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K) || defined __USE_GNU
 /* Allocate SIZE bytes on a page boundary.  The storage cannot be freed.  */
 extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
 #endif
@@ -597,8 +597,8 @@ extern int clearenv (void) __THROW;
 #endif
 
 
-#if (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \
-    && !defined __USE_XOPEN2K
+#if ((defined __USE_MISC || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K) || defined __USE_GNU
 /* 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
+#if ((defined __USE_SVID || defined __USE_XOPEN_EXTENDED)	\
+     && !defined __USE_XOPEN2K) || defined __USE_GNU
 /* Convert floating point numbers to strings.  The returned values are
    valid only until another call to the same function.  */