From 4efeffc1d583597e4f52985b9747269e47b754e2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 26 Feb 2012 13:17:27 -0500 Subject: Fix up POSIX testing in conformtest --- conform/data/aio.h-data | 4 ++-- conform/data/fcntl.h-data | 11 ++++++++--- conform/data/glob.h-data | 4 ++++ conform/data/grp.h-data | 4 ++++ conform/data/pthread.h-data | 10 +++++----- conform/data/pwd.h-data | 5 +++++ conform/data/signal.h-data | 7 ++++++- conform/data/spawn.h-data | 2 +- conform/data/stdio.h-data | 18 +++++++++--------- conform/data/stdlib.h-data | 2 +- conform/data/stropts.h-data | 2 +- conform/data/sys/mman.h-data | 4 ++++ conform/data/sys/stat.h-data | 38 ++++++++++++++++++++++++++------------ conform/data/sys/types.h-data | 8 ++++++++ conform/data/sys/wait.h-data | 13 ++++++++++++- conform/data/time.h-data | 6 +++++- conform/data/unistd.h-data | 23 +++++++++++++++++++++-- conform/data/utime.h-data | 4 ++++ 18 files changed, 126 insertions(+), 39 deletions(-) (limited to 'conform/data') diff --git a/conform/data/aio.h-data b/conform/data/aio.h-data index b810014b3f..d6d0acbbe6 100644 --- a/conform/data/aio.h-data +++ b/conform/data/aio.h-data @@ -28,12 +28,12 @@ function int aio_suspend (const struct aiocb* const[], int, const struct timespe function int aio_write (struct aiocb*) function int lio_listio (int, struct aiocb *const[], int, struct sigevent*) -# if !defined POSIX +// POSIX in theory doesn't allow the header to be self contained but +// this was fixed later and we do not test for this here. allow-header fcntl.h allow-header signal.h allow-header sys/types.h allow-header time.h -# endif allow aio_* allow lio_* diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data index 54eed417e7..46892488b1 100644 --- a/conform/data/fcntl.h-data +++ b/conform/data/fcntl.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 constant F_DUPFD constant F_GETFD constant F_SETFD @@ -7,8 +7,10 @@ constant F_SETFL constant F_GETLK constant F_SETLK constant F_SETLKW +#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 constant F_GETOWN constant F_SETOWN +#endif constant FD_CLOEXEC @@ -16,9 +18,11 @@ constant F_RDLCK constant F_UNLCK constant F_WRLCK +#if !defined POSIX constant SEEK_SET constant SEEK_CUR constant SEEK_END +#endif constant O_CREAT constant O_EXCL @@ -37,6 +41,7 @@ constant O_RDONLY constant O_RDWR constant O_WRONLY +#if !defined POSIX constant S_IFMT constant S_IFBLK constant S_IFCHR @@ -60,9 +65,10 @@ constant S_IWOTH constant S_IXOTH constant S_ISUID constant S_ISGID -#if !defined POSIX && !defined POSIX2008 +#if !defined POSIX2008 constant S_ISVTX #endif +#endif #if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 constant POSIX_FADV_NORMAL @@ -103,7 +109,6 @@ constant O_EXEC constant O_SEARCH constant O_DIRECTORY constant O_NOFOLLOW -constant FD_CLOEXEC constant F_DUPFD_CLOEXEC constant AT_FDCWD constant AT_EACCESS diff --git a/conform/data/glob.h-data b/conform/data/glob.h-data index 23a5077950..fc2c7febf6 100644 --- a/conform/data/glob.h-data +++ b/conform/data/glob.h-data @@ -1,4 +1,8 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define size_t __size_t +#endif + type glob_t element glob_t size_t gl_pathc element glob_t {char**} gl_pathv diff --git a/conform/data/grp.h-data b/conform/data/grp.h-data index 384e1ad5ba..1edba738bb 100644 --- a/conform/data/grp.h-data +++ b/conform/data/grp.h-data @@ -1,4 +1,8 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define gid_t __gid_t +#endif + type {struct group} element {struct group} {char*} gr_name element {struct group} gid_t gr_gid diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data index bf25902127..4af4d05b5b 100644 --- a/conform/data/pthread.h-data +++ b/conform/data/pthread.h-data @@ -48,10 +48,6 @@ type pthread_spinlock_t # endif type pthread_t -#ifdef POSIX -# define sigset_t __sigset_t -#endif - function int pthread_attr_destroy (pthread_attr_t*) function int pthread_attr_getdetachstate (const pthread_attr_t*, int*) # ifndef POSIX @@ -95,10 +91,14 @@ function int pthread_cond_signal (pthread_cond_t*) function int pthread_cond_timedwait (pthread_cond_t*, pthread_mutex_t*, const struct timespec*) function int pthread_cond_wait (pthread_cond_t*, pthread_mutex_t*) function int pthread_condattr_destroy (pthread_condattr_t*) +#if !defined POSIX && !defined UNIX98 && !defined XOPEN2K optional-function int pthread_condattr_getclock (const pthread_condattr_t*, clockid_t*) +#endif function int pthread_condattr_getpshared (const pthread_condattr_t*, int*) function int pthread_condattr_init (pthread_condattr_t*) +#if !defined POSIX && !defined UNIX98 && !defined XOPEN2K optional-function int pthread_condattr_setclock (pthread_condattr_t*, clockid_t) +#endif function int pthread_condattr_setpshared (pthread_condattr_t*, int) function int pthread_create (pthread_t*, const pthread_attr_t*, void *(*) (void*), void*) function int pthread_detach (pthread_t) @@ -162,7 +162,7 @@ function int pthread_setconcurrency (int) # endif function int pthread_setschedparam (pthread_t, int, const struct sched_param*) function int pthread_setspecific (pthread_key_t, const void*) -# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 function int pthread_sigmask (int, const sigset_t*, sigset_t*) # endif # if !defined POSIX diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data index f779a697b3..64d617fdcf 100644 --- a/conform/data/pwd.h-data +++ b/conform/data/pwd.h-data @@ -1,4 +1,9 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define uid_t __uid_t +# define gid_t __gid_t +#endif + type {struct passwd} element {struct passwd} {char*} pw_name element {struct passwd} uid_t pw_uid diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data index 927211b28a..18f1b9e096 100644 --- a/conform/data/signal.h-data +++ b/conform/data/signal.h-data @@ -8,7 +8,12 @@ typed-constant SIG_IGN {void(*)(int)} type sig_atomic_t #if !defined ISO && !defined ISO99 && !defined ISO11 type sigset_t +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX type pid_t +#elif defined POSIX +# define pid_t __pid_t +# define uid_t __uid_t #endif #if defined XOPEN2K8 || defined POSIX2008 type size_t @@ -28,7 +33,7 @@ element {struct timespec} __time_t tv_sec element {struct timespec} long tv_nsec #endif -#if defined UNIX98 || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K8 || defined POSIX2008 element {union sigval} int sival_int element {union sigval} {void*} sival_ptr diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data index 889b5bc7db..637f2bf0d0 100644 --- a/conform/data/spawn.h-data +++ b/conform/data/spawn.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX type posix_spawnattr_t type posix_spawn_file_actions_t # if defined XOPEN2K8 || defined POSIX2008 diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data index ac2dfc4215..abd3a8e8c1 100644 --- a/conform/data/stdio.h-data +++ b/conform/data/stdio.h-data @@ -56,7 +56,7 @@ function {char*} cuserid (char*) function int dprintf (int, const char*, ...) #endif function int fclose (FILE*) -#if defined XOPEN2K8 || defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4 function {FILE*} fdopen (int, const char*) #endif function int feof (FILE*) @@ -68,7 +68,7 @@ function {char*} fgets (char*, int, FILE*) #if !defined ISO && !defined ISO99 && !defined ISO11 function int fileno (FILE*) #endif -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function void flockfile (FILE*) #endif #if defined XOPEN2K8 || defined POSIX2008 @@ -90,14 +90,14 @@ function {long int} ftell (FILE*) #if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function off_t ftello (FILE*) #endif -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int ftrylockfile (FILE*) function void funlockfile (FILE*) #endif function size_t fwrite (const void*, size_t, size_t, FILE*) function int getc (FILE*) function int getchar (void) -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int getc_unlocked (FILE*) function int getchar_unlocked () #endif @@ -127,7 +127,7 @@ function {FILE*} popen (const char*, const char*) function int printf (const char*, ...) function int putc (int, FILE*) function int putchar (int) -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int putc_unlocked (int, FILE*) function int putchar_unlocked (int) #endif @@ -159,18 +159,18 @@ function int ungetc (int, FILE*) function int vdprintf (int, const char*, va_list) #endif function int vfprintf (FILE*, const char*, va_list) -#if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 +#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 function int vfscanf (FILE*, const char*, va_list) #endif function int vprintf (const char*, va_list) -#if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 +#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 function int vscanf (const char*, va_list) #endif -#ifndef ISO +#if !defined ISO && !defined POSIX function int vsnprintf (char*, size_t, const char*, va_list) #endif function int vsprintf (char*, const char*, va_list) -#if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 +#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 function int vsscanf (const char*, const char*, va_list) #endif diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data index e6abfed3e3..f42d4a7ac4 100644 --- a/conform/data/stdlib.h-data +++ b/conform/data/stdlib.h-data @@ -138,7 +138,7 @@ function {void*} realloc (void*, size_t) function {char*} realpath (const char*, char*) function {unsigned short int*} seed48 (unsigned short int[3]) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX function int setenv (const char*, const char*, int) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 diff --git a/conform/data/stropts.h-data b/conform/data/stropts.h-data index 882f916cc3..d978a1c5e9 100644 --- a/conform/data/stropts.h-data +++ b/conform/data/stropts.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX type {struct bandinfo} element {struct bandinfo} {unsigned char} bi_pri diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data index 3392ad1324..21be6ff59a 100644 --- a/conform/data/sys/mman.h-data +++ b/conform/data/sys/mman.h-data @@ -17,11 +17,13 @@ constant MCL_FUTURE constant MAP_FAILED +#ifndef POSIX constant POSIX_MADV_NORMAL constant POSIX_MADV_SEQUENTIAL constant POSIX_MADV_RANDOM constant POSIX_MADV_WILLNEED constant POSIX_MADV_DONTNEED +#endif optional-constant POSIX_TYPED_MEM_ALLOCATE optional-constant POSIX_TYPED_MEM_ALLOCATE_CONTIG @@ -42,7 +44,9 @@ function int msync (void*, size_t, int) function int munlock (const void*, size_t) function int munlockall (void) function int munmap (void*, size_t) +#ifndef POSIX function int posix_madvise (void*, size_t, int) +#endif optional-function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*) optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*) optional-function int posix_typed_mem_open (const char*, int, int) diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data index 547f607b1f..a7db93f576 100644 --- a/conform/data/sys/stat.h-data +++ b/conform/data/sys/stat.h-data @@ -1,5 +1,29 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined POSIX && !defined POSIX2008 +type blkcnt_t +type blksize_t +#endif +#ifndef POSIX +type dev_t +type ino_t +type mode_t +type nlink_t +type uid_t +type gid_t +type off_t +type time_t +#else +# define dev_t __dev_t +# define ino_t __ino_t +# define mode_t __mode_t +# define nlink_t __nlink_t +# define uid_t __uid_t +# define gid_t __gid_t +# define off_t __off_t +# define time_t __time_t +#endif + type {struct stat} element {struct stat} dev_t st_dev @@ -20,18 +44,6 @@ element {struct stat} blksize_t st_blksize element {struct stat} blkcnt_t st_blocks #endif -#if !defined POSIX && !defined POSIX2008 -type blkcnt_t -type blksize_t -#endif -type dev_t -type ino_t -type mode_t -type nlink_t -type uid_t -type gid_t -type off_t -type time_t # if defined XOPEN2K8 || defined POSIX2008 type {struct timespec} element {struct timespec} time_t tv_sec @@ -97,7 +109,9 @@ function int fstat (int, struct stat*) function int fstatat (int, const char*, struct stat*, int) function int futimens (int, const struct timespec[2]) # endif +#if !defined POSIX function int lstat (const char*, struct stat*) +#endif function int mkdir (const char*, mode_t) # if defined XOPEN2K8 || defined POSIX2008 function int mkdirat (int, const char*, mode_t) diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data index 2befff56a1..824392d498 100644 --- a/conform/data/sys/types.h-data +++ b/conform/data/sys/types.h-data @@ -1,15 +1,19 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 type blkcnt_t +#if !defined POSIX type blksize_t type clock_t type clockid_t +#endif type dev_t # if !defined POSIX type fsblkcnt_t type fsfilcnt_t # endif type gid_t +#if !defined POSIX type id_t +#endif type ino_t # if !defined POSIX && !defined POSIX2008 type key_t @@ -19,17 +23,21 @@ type nlink_t type off_t type pid_t type pthread_attr_t +#if !defined POSIX type pthread_barrier_t type pthread_barrierattr_t +#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 type pthread_spinlock_t +#endif type pthread_t type size_t type ssize_t diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data index 56dea06cfd..818766921d 100644 --- a/conform/data/sys/wait.h-data +++ b/conform/data/sys/wait.h-data @@ -1,4 +1,9 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define pid_t __pid_t +# define uid_t __uid_t +#endif + constant WNOHANG constant WUNTRACED @@ -20,6 +25,7 @@ constant WCONTINUED constant WNOHANG constant WNOWAIT +#if !defined POSIX type idtype_t constant P_ALL @@ -27,6 +33,7 @@ constant P_PID constant P_PGID type id_t +#endif type siginfo_t @@ -40,18 +47,22 @@ element siginfo_t int si_status element siginfo_t long si_band element siginfo_t {union sigval} si_value +#if !defined POSIX type {struct rusage} element {struct rusage} {struct timeval} ru_utime element {struct rusage} {struct timeval} ru_stime +#endif type pid_t function pid_t wait (int*) -#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 function pid_t wait3 (int*, int, struct rusage*) #endif +#if !defined POSIX function int waitid (idtype_t, id_t, siginfo_t*, int) +#endif function pid_t waitpid (pid_t, int*, int) allow-header signal.h diff --git a/conform/data/time.h-data b/conform/data/time.h-data index 1e089d07f1..0deb6be136 100644 --- a/conform/data/time.h-data +++ b/conform/data/time.h-data @@ -43,7 +43,7 @@ function int timespec_get (struct timespec *, int) #if !defined ISO && !defined ISO99 && !defined ISO11 # if !defined XOPEN21K && !defined XOPEN2K8 && !defined POSIX2008 -constant CLK_TCK +symbol CLK_TCK # endif constant CLOCK_PROCESS_CPUTIME_ID constant CLOCK_THREAD_CPUTIME_ID @@ -71,10 +71,14 @@ variable int getdate_err # endif function {char*} asctime_r (const struct tm*, char*) +#if !defined POSIX function int clock_getcpuclockid (pid_t, clockid_t*) +#endif function int clock_getres (clockid_t, struct timespec*) function int clock_gettime (clockid_t, struct timespec*) +#if !defined POSIX function int clock_nanosleep (clockid_t, int, const struct timespec*, struct timespec*) +#endif function int clock_settime (clockid_t, const struct timespec*) function {char*} ctime_r (const time_t*, char*) # if !defined POSIX && !defined POSIX2008 diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data index ecefa539f2..d23a68ff89 100644 --- a/conform/data/unistd.h-data +++ b/conform/data/unistd.h-data @@ -1,4 +1,11 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define uid_t __uid_t +# define gid_t __gid_t +# define off_t __off_t +# define pid_t __pid_t +#endif + optional-constant _POSIX_VERSION optional-constant _POSIX2_C_VERSION optional-constant _XOPEN_VERSION @@ -336,9 +343,11 @@ type gid_t type off_t type pid_t +#if !defined POSIX type useconds_t type intptr_t +#endif function int access (const char*, int) function {unsigned int} alarm (unsigned int) @@ -355,8 +364,8 @@ function size_t confstr (int, char*, size_t) #if !defined POSIX && !defined POSIX2008 function {char*} crypt (const char*, const char*) #endif -function {char*} ctermid (char*) #if defined XPG3 || defined XPG4 || defined UNIX98 +function {char*} ctermid (char*) function {char*} cuserid (char*) #endif function int dup (int) @@ -374,7 +383,9 @@ function void _exit (int) # if defined XOPEN2K8 || defined POSIX2008 function int faccessat (int, const char*, int, int) # endif +#if !defined POSIX function int fchown (int, uid_t, gid_t) +#endif # if defined XOPEN2K8 || defined POSIX2008 function int fchownat (int, const char*, uid_t, gid_t, int) # endif @@ -400,7 +411,9 @@ function int getgroups (int, gid_t[]) #if !defined POSIX && !defined POSIX2008 function long gethostid (void) #endif +#if !defined POSIX function int gethostname (char*, size_t) +#endif function {char*} getlogin (void) function int getlogin_r (char*, size_t) function int getopt (int, char*const[], const char*) @@ -442,14 +455,16 @@ function int pipe (int[2]) #ifndef POSIX function ssize_t pread (int, void*, size_t, off_t) #endif -#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void)) #endif #ifndef POSIX function ssize_t pwrite (int, const void*, size_t, off_t) #endif function ssize_t read (int, void*, size_t) +#ifndef POSIX function ssize_t readlink (const char*, char*, size_t) +#endif # if defined XOPEN2K8 || defined POSIX2008 function ssize_t readlinkat (int, const char*, char*, size_t) # endif @@ -457,8 +472,10 @@ function int rmdir (const char*) #if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX && !defined POSIX2008 function {void*} sbrk (intptr_t) #endif +#ifndef POSIX function int setegid (gid_t) function int seteuid (uid_t) +#endif function int setgid (gid_t) function int setpgid (pid_t, pid_t) # if !defined POSIX && !defined POSIX2008 @@ -472,7 +489,9 @@ function {unsigned int} sleep (unsigned int) # if !defined POSIX && !defined POSIX2008 function void swab (const void*, void*, ssize_t) # endif +#ifndef POSIX function int symlink (const char*, const char*) +# endif # if defined XOPEN2K8 || defined POSIX2008 function int symlinkat (const char*, int, const char*) # endif diff --git a/conform/data/utime.h-data b/conform/data/utime.h-data index aab9039f38..e3201651c1 100644 --- a/conform/data/utime.h-data +++ b/conform/data/utime.h-data @@ -1,4 +1,8 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 +#ifdef POSIX +# define time_t __time_t +#endif + type {struct utimbuf} element {struct utimbuf} time_t actime -- cgit v1.2.3