Fix up unistd.h tests.

diff --git a/ChangeLog b/ChangeLog
index 5ffe09a..7c45cf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 
+       * conform/data/unistd.h-data: Fix up older POSIX tests.
+
        * stdlib/stdlib.h: Fix handling symbols removed in XPG7.
        * posix/unistd.h: Likewise.
 

diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 24fdfa7..72fbdd6 100644 (file)
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -378,7 +378,9 @@ function int fchown (int, uid_t, gid_t)
 # if defined XOPEN2K8 || defined POSIX2008
 function int fchownat (int, const char*, uid_t, gid_t, int)
 # endif
+#ifndef POSIX
 function int fchdir (int)
+#endif
 function int fdatasync (int)
 # if defined XOPEN2K8 || defined POSIX2008
 function int fexecve (int, char *const[], char *const[])
@@ -412,13 +414,17 @@ function pid_t getpgid (pid_t)
 function pid_t getpgrp (void)
 function pid_t getpid (void)
 function pid_t getppid (void)
+#ifndef POSIX
 function pid_t getsid (pid_t)
+#endif
 function uid_t getuid (void)
 #if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K
 function {char*} getwd (char*)
 #endif
 function int isatty (int)
+#ifndef POSIX
 function int lchown (const char*, uid_t, gid_t)
+#endif
 function int link (const char*, const char*)
 # if defined XOPEN2K8 || defined POSIX2008
 function int linkat (int, const char*, int, const char*, int)
@@ -433,11 +439,15 @@ function int nice (int)
 function {long int} pathconf (const char*, int)
 function int pause (void)
 function int pipe (int[2])
+#ifndef POSIX
 function ssize_t pread (int, void*, size_t, off_t)
+#endif
 #if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
 function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
 #endif
+#ifndef POSIX
 function ssize_t pwrite (int, const void*, size_t, off_t)
+#endif
 function ssize_t read (int, void*, size_t)
 function ssize_t readlink (const char*, char*, size_t)
 # if defined XOPEN2K8 || defined POSIX2008
@@ -472,7 +482,9 @@ function void sync (void)
 function {long int} sysconf (int)
 function pid_t tcgetpgrp (int)
 function int tcsetpgrp (int, pid_t)
+#ifndef POSIX
 function int truncate (const char*, off_t)
+#endif
 function {char*} ttyname (int)
 function int ttyname_r (int, char*, size_t)
 #if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K