conformtest: Clean up expectations for POSIX for sched.h.

diff --git a/ChangeLog b/ChangeLog
index 9824ec4..baa19d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-25  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/sched.h-data [XPG3 || XPG4]: Disable whole file.
+       [POSIX || UNIX98]: Require rather than permitting all symbols from
+       <time.h>.
+       [POSIX || UNIX98] (sched_ss_low_priority): Do not specify optional
+       element of struct sched_param.
+       [POSIX || UNIX98] (sched_ss_repl_period): Likewise.
+       [POSIX || UNIX98] (sched_ss_init_budget): Likewise.
+       [POSIX || UNIX98] (sched_ss_max_repl): Likewise.
+       [POSIX || UNIX98] (SCHED_SPORADIC): Do not specify optional
+       constant.
+
 2013-09-24  Olivier Langlois  <olivier@olivierlanglois.net>
 
        * stdio-common/tst-long-dbl-fphex.c (do_test): Fix swprintf length

diff --git a/conform/data/sched.h-data b/conform/data/sched.h-data
index 78eb2e4..610406d 100644 (file)
--- a/conform/data/sched.h-data
+++ b/conform/data/sched.h-data
@@ -1,10 +1,18 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4
+# if defined POSIX || defined UNIX98
+#  include "time.h-data"
+# else
+allow-header time.h
+# endif
+
 type {struct sched_param}
 element {struct sched_param} int sched_priority
+# if !defined POSIX && !defined UNIX98
 optional-element {struct sched_param} int sched_ss_low_priority
 optional-element {struct sched_param} {struct timespec} sched_ss_repl_period
 optional-element {struct sched_param} {struct timespec} sched_ss_init_budget
 optional-element {struct sched_param} int sched_ss_max_repl
+# endif
 
 # if defined XOPEN2K8 || defined POSIX2008
 type pid_t
@@ -14,7 +22,9 @@ type {struct timespec}
 
 constant SCHED_FIFO
 constant SCHED_RR
+# if !defined POSIX && !defined UNIX98
 optional-constant SCHED_SPORADIC
+# endif
 constant SCHED_OTHER
 
 function int sched_get_priority_max (int)
@@ -26,8 +36,6 @@ function int sched_setparam (pid_t, const struct sched_param*)
 function int sched_setscheduler (pid_t, int, const struct sched_param*)
 function int sched_yield (void)
 
-allow-header time.h
-
 allow sched_*
 allow SCHED_*
 allow *_t