From fdbdbc83a53cfee6edff9f737e188a56925f1db1 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 13 May 2016 17:26:04 +0000 Subject: conformtest: Correct some stdlib.h expectations for XPG3. This patch corrects some spurious conformtest stdlib.h expectations for XPG3 (not based on a full review of the expectations for that standard, so other issues may remain). Tested for x86_64 and x86. * conform/data/stdlib.h-data (a64l): Do not expect for [XPG3]. (ecvt): Likewise. (fcvt): Likewise. (gcvt): Likewise. (getsubopt): Likewise. (grantpt): Likewise. (initstate): Likewise. (l64a): Likewise. (mktemp): Likewise. (mkstemp): Likewise. (ptsname): Likewise. (random): Likewise. (realpath): Likewise. (setstate): Likewise. (srandom): Likewise. (ttyslot): Likewise. (unlockpt): Likewise. (valloc): Likewise. --- conform/data/stdlib.h-data | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'conform') diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data index abe296a2ab..cf839f34c2 100644 --- a/conform/data/stdlib.h-data +++ b/conform/data/stdlib.h-data @@ -35,7 +35,7 @@ macro WTERMSIG #if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 && !defined POSIX function void _Exit (int) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function long a64l (const char*) #endif function void abort (void) @@ -59,28 +59,32 @@ function div_t div (int, int) #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function double drand48 (void) #endif -#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K +#if defined XPG4 || defined UNIX98 || defined XOPEN2K function {char*} ecvt (double, int, int*, int*) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function double erand48 (unsigned short int[3]) #endif function void exit (int) -#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K +#if defined XPG4 || defined UNIX98 || defined XOPEN2K function {char*} fcvt (double, int, int*, int*) #endif function void free (void*) -#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K +#if defined XPG4 || defined UNIX98 || defined XOPEN2K function {char*} gcvt (double, int, char*) #endif function {char*} getenv (const char*) -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX function int getsubopt (char**, char *const*, char**) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function int grantpt (int) function {char*} initstate (unsigned int, char*, size_t) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function {long int} jrand48 (unsigned short int[3]) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function {char*} l64a (long) #endif function {long int} labs (long int) @@ -102,10 +106,10 @@ function int mbtowc (wchar_t*, const char*, size_t) #if defined XOPEN2K8 || defined POSIX2008 function {char*} mkdtemp (char*) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 function {char*} mktemp (char*) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX function int mkstemp (char*) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 @@ -118,8 +122,10 @@ function int posix_memalign (void**, size_t, size_t) #if defined XOPEN2K || defined XOPEN2K8 function int posix_openpt (int) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function {char*} ptsname (int) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function int putenv (char*) #endif function void qsort (void*, size_t, size_t, int(*)(const void*, const void*)) @@ -130,12 +136,14 @@ function int rand (void) #if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int rand_r (unsigned int*) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function long random (void) #endif function {void*} realloc (void*, size_t) -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function {char*} realpath (const char*, char*) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function {unsigned short int*} seed48 (unsigned short int[3]) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 @@ -143,11 +151,15 @@ function int setenv (const char*, const char*, int) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function void setkey (const char*) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function {char*} setstate (char*) #endif function void srand (unsigned int) #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 function void srand48 (long int) +#endif +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function void srandom (unsigned) #endif function double strtod (const char*, char**) @@ -162,16 +174,16 @@ function {long long int} strtoll (const char*, char**, int) function {unsigned long long int} strtoull (const char*, char**, int) #endif function int system (const char*) -#if defined XPG3 || defined XPG4 || defined UNIX98 +#if defined XPG4 || defined UNIX98 function int ttyslot (void) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008 function int unlockpt (int) #endif #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 function int unsetenv (const char*) #endif -#if defined XPG3 || defined XPG4 || defined UNIX98 +#if defined XPG4 || defined UNIX98 function {void*} valloc (size_t) #endif function size_t wcstombs (char*, const wchar_t*, size_t) -- cgit v1.2.3