summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-25 19:51:25 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-25 19:51:25 +0000
commit773bd1e1093b716639a40420f9956182c5f89b07 (patch)
tree035fcb3a83c0da3a0274cbec15f3c463268ba4ac
parentd921b30445e8dfc6d9dddf030383a6227b21ea0d (diff)
Update.
* conform/data/unistd.h-data: Mark functions removed in XPG6 correctly. * posix/unistd.h: Don't make functions removed in XPG6 available if
-rw-r--r--ChangeLog5
-rw-r--r--conform/data/unistd.h-data11
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 297856744c..82e2539908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2001-01-25 Ulrich Drepper <drepper@redhat.com>
- * posix/unistd.h: Make functions removed in XPG6 not available if
+ * conform/data/unistd.h-data: Mark functions removed in XPG6
+ correctly.
+
+ * posix/unistd.h: Don't make functions removed in XPG6 available if
__USE_XOPEN2K.
* conform/conformtest.pl: Implement optional-constant.
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index de880d3c1a..9211402831 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -1,3 +1,4 @@
+#ifndef ISO
optional-constant _POSIX_VERSION
optional-constant _POSIX2_C_VERSION
optional-constant _XOPEN_VERSION
@@ -277,14 +278,17 @@ function int access (const char*, int)
function {unsigned int} alarm (unsigned int)
function int brk (void*)
function int chdir (const char*)
+#if defined XPG3 || defined XPG4 || defined UNIX98
function int chroot (const char*)
+#endif
function int chown (const char*, uid_t, gid_t)
function int close (int)
function size_t confstr (int, char*, size_t)
function {char*} crypt (const char*, const char*)
function {char*} ctermid (char*)
-// cuserid got removed in XPG6
-allow cuserid
+#if defined XPG3 || defined XPG4 || defined UNIX98
+function {char*} cuserid (char*)
+#endif
function int dup (int)
function int dup2 (int, int)
function void encrypt (char[64], int)
@@ -313,7 +317,9 @@ function {char*} getlogin (void)
function int getlogin_r (char*, size_t)
function int getopt (int, char*const[], const char*)
function int getpagesize (void)
+#if defined XPG3 || defined XPG4 || defined UNIX98
function {char*} getpass (const char*)
+#endif
function pid_t getpgid (pid_t)
function pid_t getpgrp (void)
function pid_t getpid (void)
@@ -368,3 +374,4 @@ variable int opterr
variable int optopt
allow *_t
+#endif