about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--conform/Makefile1
-rw-r--r--conform/data/stdarg.h-data2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cbc1b1a2f..b281c54a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-04-26  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/stdarg.h-data [XOPEN2K] (va_copy): Require macro.
+	* conform/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove
+	variable.
+
 	* libio/stdio.h (off_t): Define if [__USE_XOPEN2K], not
 	[__USE_XOPEN2K8].
 	[__USE_LARGEFILE64] (off64_t): Likewise.
diff --git a/conform/Makefile b/conform/Makefile
index 7af4b2fee8..a1759c929a 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -215,7 +215,6 @@ test-xfail-XOPEN2K/langinfo.h/conform = yes
 test-xfail-XOPEN2K/mqueue.h/conform = yes
 test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
-test-xfail-XOPEN2K/stdarg.h/conform = yes
 test-xfail-XOPEN2K/sys/wait.h/conform = yes
 test-xfail-XOPEN2K/ucontext.h/conform = yes
 test-xfail-POSIX2008/arpa/inet.h/conform = yes
diff --git a/conform/data/stdarg.h-data b/conform/data/stdarg.h-data
index 2c87a3b56d..53addb91fa 100644
--- a/conform/data/stdarg.h-data
+++ b/conform/data/stdarg.h-data
@@ -5,7 +5,7 @@ macro va_start
 macro va_arg
 macro va_end
 
-#if defined ISO99 || defined ISO11 || defined POSIX2008 || defined XOPEN2K8
+#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008 || defined XOPEN2K8
 macro va_copy
 #endif