mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
0516e24d18
The conform/ tests test -D_XOPEN_SOURCE under the name "XPG3", and -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED under the name "XPG4". That naming is misleading. _XOPEN_SOURCE_EXTENDED actually means XPG4.2, including UX-shaded interfaces. _XOPEN_SOURCE actually means XPG4, or XPG4.2 without UX-shaded interfaces. (Prior XPG versions also used _XOPEN_SOURCE, but without any versioning of the values of the macro, so XPG4.2 without UX-shaded interfaces is the only sensible set of interfaces for glibc to expose given _XOPEN_SOURCE=1 without _XOPEN_SOURCE_EXTENDED defined.) This patch fixes the naming in the conform/ tests, so that what is now called XPG4 is changed to XPG42, and what is now called XPG3 is changed to XPG4. Tested for x86_64 (and verified the complete set of expectations is unchanged by the patch beyond the intended renaming). * conform/GlibcConform.pm (XPG4): Rename standard to XPG42. (XPG3): Rename standard to XPG4. * conform/Makefile: Likewise. * conform/list-header-symbols.pl: Likewise. * conform/data/aio.h-data: Likewise. * conform/data/arpa/inet.h-data: Likewise. * conform/data/complex.h-data: Likewise. * conform/data/ctype.h-data: Likewise. * conform/data/dlfcn.h-data: Likewise. * conform/data/fcntl.h-data: Likewise. * conform/data/fenv.h-data: Likewise. * conform/data/float.h-data: Likewise. * conform/data/fmtmsg.h-data: Likewise. * conform/data/ftw.h-data: Likewise. * conform/data/grp.h-data: Likewise. * conform/data/inttypes.h-data: Likewise. * conform/data/iso646.h-data: Likewise. * conform/data/langinfo.h-data: Likewise. * conform/data/libgen.h-data: Likewise. * conform/data/limits.h-data: Likewise. * conform/data/locale.h-data: Likewise. * conform/data/math.h-data: Likewise. * conform/data/mqueue.h-data: Likewise. * conform/data/ndbm.h-data: Likewise. * conform/data/net/if.h-data: Likewise. * conform/data/netdb.h-data: Likewise. * conform/data/netinet/in.h-data: Likewise. * conform/data/poll.h-data: Likewise. * conform/data/pthread.h-data: Likewise. * conform/data/pwd.h-data: Likewise. * conform/data/sched.h-data: Likewise. * conform/data/search.h-data: Likewise. * conform/data/semaphore.h-data: Likewise. * conform/data/signal.h-data: Likewise. * conform/data/spawn.h-data: Likewise. * conform/data/stdbool.h-data: Likewise. * conform/data/stdint.h-data: Likewise. * conform/data/stdio.h-data: Likewise. * conform/data/stdlib.h-data: Likewise. * conform/data/string.h-data: Likewise. * conform/data/strings.h-data: Likewise. * conform/data/stropts.h-data: Likewise. * conform/data/sys/mman.h-data: Likewise. * conform/data/sys/resource.h-data: Likewise. * conform/data/sys/select.h-data: Likewise. * conform/data/sys/socket.h-data: Likewise. * conform/data/sys/stat.h-data: Likewise. * conform/data/sys/statvfs.h-data: Likewise. * conform/data/sys/time.h-data: Likewise. * conform/data/sys/timeb.h-data: Likewise. * conform/data/sys/types.h-data: Likewise. * conform/data/sys/uio.h-data: Likewise. * conform/data/sys/un.h-data: Likewise. * conform/data/sys/wait.h-data: Likewise. * conform/data/syslog.h-data: Likewise. * conform/data/termios.h-data: Likewise. * conform/data/tgmath.h-data: Likewise. * conform/data/time.h-data: Likewise. * conform/data/ucontext.h-data: Likewise. * conform/data/unistd.h-data: Likewise. * conform/data/utmpx.h-data: Likewise. * conform/data/varargs.h-data: Likewise. * conform/data/wchar.h-data: Likewise. * conform/data/wctype.h-data: Likewise.
203 lines
7.6 KiB
Plaintext
203 lines
7.6 KiB
Plaintext
type div_t
|
|
element div_t int quot
|
|
element div_t int rem
|
|
type ldiv_t
|
|
element ldiv_t long quot
|
|
element ldiv_t long rem
|
|
|
|
macro-int-constant EXIT_FAILURE
|
|
macro-int-constant EXIT_SUCCESS == 0
|
|
|
|
macro-constant NULL == 0
|
|
macro-int-constant RAND_MAX >= 32767
|
|
macro MB_CUR_MAX
|
|
|
|
#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
|
|
type lldiv_t
|
|
element lldiv_t {long long} quot
|
|
element lldiv_t {long long} rem
|
|
#endif
|
|
type size_t
|
|
type wchar_t
|
|
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
|
|
constant WNOHANG
|
|
constant WUNTRACED
|
|
|
|
macro WEXITSTATUS
|
|
macro WIFEXITED
|
|
macro WIFSIGNALED
|
|
macro WIFSTOPPED
|
|
macro WSTOPSIG
|
|
macro WTERMSIG
|
|
#endif
|
|
|
|
#if !defined ISO && !defined XPG4 && !defined XPG42 && !defined UNIX98 && !defined POSIX
|
|
function void _Exit (int)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !defined POSIX && !defined POSIX2008
|
|
function long a64l (const char*)
|
|
#endif
|
|
function void abort (void)
|
|
function int abs (int)
|
|
#if defined ISO11
|
|
function {void *} aligned_alloc (size_t, size_t)
|
|
#endif
|
|
function int atexit (void(*)(void))
|
|
#if defined ISO11
|
|
function int at_quick_exit (void (*) (void))
|
|
#endif
|
|
function double atof (const char*)
|
|
function int atoi (const char*)
|
|
function {long int} atol (const char*)
|
|
#if !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function {long long} atoll (const char*)
|
|
#endif
|
|
function {void*} bsearch (const void*, const void*, size_t, size_t, int(*)(const void*, const void*))
|
|
function {void*} calloc (size_t, size_t)
|
|
function div_t div (int, int)
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
|
function double drand48 (void)
|
|
#endif
|
|
#if defined XPG42 || 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 XPG42 || defined UNIX98 || defined XOPEN2K
|
|
function {char*} fcvt (double, int, int*, int*)
|
|
#endif
|
|
function void free (void*)
|
|
#if defined XPG42 || defined UNIX98 || defined XOPEN2K
|
|
function {char*} gcvt (double, int, char*)
|
|
#endif
|
|
function {char*} getenv (const char*)
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !defined POSIX
|
|
function int getsubopt (char**, char *const*, char**)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !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 XPG4 && !defined POSIX && !defined POSIX2008
|
|
function {char*} l64a (long)
|
|
#endif
|
|
function {long int} labs (long int)
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
|
function void lcong48 (unsigned short int[7])
|
|
#endif
|
|
function ldiv_t ldiv (long int, long int)
|
|
#if !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function {long long} llabs (long long)
|
|
function lldiv_t lldiv (long long, long long)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
|
function {long int} lrand48 (void)
|
|
#endif
|
|
function {void*} malloc (size_t)
|
|
function int mblen (const char*, size_t)
|
|
function size_t mbstowcs (wchar_t*, const char*, size_t)
|
|
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 XPG4 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008
|
|
function {char*} mktemp (char*)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !defined POSIX
|
|
function int mkstemp (char*)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
|
function {long int} mrand48 (void)
|
|
function {long int} nrand48 (unsigned short int[3])
|
|
#endif
|
|
#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
|
|
function int posix_memalign (void**, size_t, size_t)
|
|
#endif
|
|
#if defined XOPEN2K || defined XOPEN2K8
|
|
function int posix_openpt (int)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !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*))
|
|
#if defined ISO11
|
|
function void quick_exit (int)
|
|
#endif
|
|
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 XPG4 && !defined POSIX && !defined POSIX2008
|
|
function long random (void)
|
|
#endif
|
|
function {void*} realloc (void*, size_t)
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !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 XPG4 && !defined XPG42 && !defined UNIX98
|
|
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 XPG4 && !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 XPG4 && !defined POSIX && !defined POSIX2008
|
|
function void srandom (unsigned)
|
|
#endif
|
|
function double strtod (const char*, char**)
|
|
#if !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function float strtof (const char*, char**)
|
|
function {long double} strtold (const char*, char**)
|
|
#endif
|
|
function {long int} strtol (const char*, char**, int)
|
|
function {unsigned long int} strtoul (const char*, char**, int)
|
|
#if !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
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 XPG42 || defined UNIX98
|
|
function int ttyslot (void)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !defined POSIX && !defined POSIX2008
|
|
function int unlockpt (int)
|
|
#endif
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function int unsetenv (const char*)
|
|
#endif
|
|
#if defined XPG42 || defined UNIX98
|
|
function {void*} valloc (size_t)
|
|
#endif
|
|
function size_t wcstombs (char*, const wchar_t*, size_t)
|
|
function int wctomb (char*, wchar_t)
|
|
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
|
|
allow-header stddef.h
|
|
allow-header limits.h
|
|
allow-header math.h
|
|
allow-header sys/wait.h
|
|
#endif
|
|
|
|
allow str[abcdefghijklmnopqrstuvwxyz]*
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11
|
|
allow *_t
|
|
#endif
|