summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--conform/Makefile1
-rw-r--r--conform/data/pwd.h-data2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f5a1dc8063..5bc942eb9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-05-19  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/pwd.h-data (endpwent): Do not expect for [XPG3].
+	(getpwent): Likewise.
+	(setpwent): Likewise.
+	* conform/Makefile (test-xfail-XPG3/pwd.h/conform): Remove
+	variable.
+
 	* conform/data/search.h-data (insque): Do not expect for [XPG3].
 	(remque): Likewise.
 	* conform/Makefile (test-xfail-XPG3/search.h/conform): Remove
diff --git a/conform/Makefile b/conform/Makefile
index eb64e0e802..573fbdec9f 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -165,7 +165,6 @@ test-xfail-XOPEN2K8/ndbm.h/conform = yes
 # Unsorted expected failures.
 test-xfail-XPG3/ftw.h/conform = yes
 test-xfail-XPG3/limits.h/conform = yes
-test-xfail-XPG3/pwd.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data
index 64d617fdcf..2c4a6fe733 100644
--- a/conform/data/pwd.h-data
+++ b/conform/data/pwd.h-data
@@ -23,7 +23,7 @@ function {struct passwd*} getpwnam (const char*)
 function {struct passwd*} getpwuid (uid_t)
 function int getpwnam_r (const char*, struct passwd*, char*, size_t, struct passwd**)
 function int getpwuid_r (uid_t, struct passwd*, char*, size_t, struct passwd**)
-# if !defined POSIX && !defined POSIX2008
+# if !defined XPG3 && !defined POSIX && !defined POSIX2008
 function void endpwent (void)
 function {struct passwd*} getpwent (void)
 function void setpwent (void)