This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

conformtest: Correct search.h expectations for XPG3


This patch corrects some conformtest expectations for search.h for
XPG3.

Tested for x86_64 and x86.

2016-05-19  Joseph Myers  <joseph@codesourcery.com>

	* conform/data/search.h-data (insque): Do not expect for [XPG3].
	(remque): Likewise.
	* conform/Makefile (test-xfail-XPG3/search.h/conform): Remove
	variable.

diff --git a/conform/Makefile b/conform/Makefile
index 6c7b683..eb64e0e 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -166,7 +166,6 @@ test-xfail-XOPEN2K8/ndbm.h/conform = yes
 test-xfail-XPG3/ftw.h/conform = yes
 test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
-test-xfail-XPG3/search.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/search.h-data b/conform/data/search.h-data
index 3abbc66..3d66fdf 100644
--- a/conform/data/search.h-data
+++ b/conform/data/search.h-data
@@ -17,10 +17,14 @@ constant leaf
 function int hcreate (size_t)
 function void hdestroy (void)
 function {ENTRY*} hsearch (ENTRY, ACTION)
+#ifndef XPG3
 function void insque (void*, void*)
+#endif
 function {void*} lfind (const void*, const void*, size_t*, size_t, int (*)(const void*, const void*))
 function {void*} lsearch (const void*, void*, size_t*, size_t, int (*)(const void*, const void*))
+#ifndef XPG3
 function void remque (void*)
+#endif
 function {void*} tdelete (const void*, void**, int(*)(const void*, const void*))
 function {void*} tfind (const void*, void*const*, int(*)(const void*, const void*))
 function {void*} tsearch (const void*, void**, int(*)(const void*, const void*))

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]