diff options
Diffstat (limited to 'conform')
-rw-r--r-- | conform/conformtest.pl | 4 | ||||
-rw-r--r-- | conform/data/pthread.h-data | 15 | ||||
-rw-r--r-- | conform/data/sched.h-data | 14 |
3 files changed, 22 insertions, 11 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl index ec2e9c308b..8b97d0dfc7 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -236,6 +236,8 @@ sub newtoken { for ($idx = 0; $idx <= $#allow; ++$idx) { return if (poorfnmatch ($allow[$idx], $token)); } + + $errors{$token} = 1; } @@ -786,7 +788,7 @@ while ($#headers >= 0) { if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) { push @allow, $7; } elsif (/^(macro|constant|macro-constant|macro-int-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { - push @allow, $1; + push @allow, $2; } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$3$4"; diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data index 292b12520b..c1e32c8d01 100644 --- a/conform/data/pthread.h-data +++ b/conform/data/pthread.h-data @@ -17,11 +17,11 @@ constant PTHREAD_PROCESS_SHARED constant PTHREAD_PROCESS_PRIVATE constant PTHREAD_SCOPE_PROCESS constant PTHREAD_SCOPE_SYSTEM +macro PTHREAD_MUTEX_INITIALIZER # ifndef POSIX constant PTHREAD_MUTEX_DEFAULT constant PTHREAD_MUTEX_ERRORCHECK constant PTHREAD_MUTEX_NORMAL -macro PTHREAD_MUTEX_INITIALIZER constant PTHREAD_MUTEX_RECURSIVE macro PTHREAD_RWLOCK_INITIALIZER # endif @@ -30,26 +30,27 @@ constant PTHREAD_MUTEX_ROBUST constant PTHREAD_MUTEX_STALLED # endif +# ifndef POSIX type pthread_attr_t -# if !defined POSIX && !defined UNIX98 +# ifndef UNIX98 type pthread_barrier_t type pthread_barrierattr_t -# endif +# endif type pthread_cond_t type pthread_condattr_t type pthread_key_t type pthread_mutex_t type pthread_mutexattr_t type pthread_once_t -# if !defined POSIX type pthread_rwlock_t type pthread_rwlockattr_t -# endif -# if !defined POSIX && !defined UNIX98 +# ifndef UNIX98 type pthread_spinlock_t -# endif +# endif type pthread_t +# endif +function int pthread_atfork (void (*) (void), void (*) (void), void (*) (void)) function int pthread_attr_destroy (pthread_attr_t*) function int pthread_attr_getdetachstate (const pthread_attr_t*, int*) # ifndef POSIX diff --git a/conform/data/sched.h-data b/conform/data/sched.h-data index 78eb2e4d78..610406d96b 100644 --- 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 |