mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08: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.
136 lines
3.7 KiB
Plaintext
136 lines
3.7 KiB
Plaintext
macro-constant NULL == 0
|
|
macro CLOCKS_PER_SEC {clock_t}
|
|
|
|
#ifdef ISO11
|
|
macro-int-constant TIME_UTC > 0
|
|
#endif
|
|
|
|
#if !defined ISO && !defined ISO99 && !defined XPG4 && !defined XPG42
|
|
type {struct timespec}
|
|
|
|
element {struct timespec} time_t tv_sec
|
|
// Bug 16437: tv_nsec has wrong type.
|
|
xfail[x86_64-x32-linux]-element {struct timespec} long tv_nsec
|
|
#endif
|
|
|
|
type size_t
|
|
type clock_t
|
|
type time_t
|
|
|
|
type {struct tm}
|
|
|
|
element {struct tm} int tm_sec
|
|
element {struct tm} int tm_min
|
|
element {struct tm} int tm_hour
|
|
element {struct tm} int tm_mday
|
|
element {struct tm} int tm_mon
|
|
element {struct tm} int tm_year
|
|
element {struct tm} int tm_wday
|
|
element {struct tm} int tm_yday
|
|
element {struct tm} int tm_isdst
|
|
|
|
function clock_t clock (void)
|
|
function double difftime (time_t, time_t)
|
|
function time_t mktime (struct tm*)
|
|
function time_t time (time_t*)
|
|
function {char*} asctime (const struct tm*)
|
|
function {char*} ctime (const time_t*)
|
|
function {struct tm*} gmtime (const time_t*)
|
|
function {struct tm*} localtime (const time_t*)
|
|
function size_t strftime (char*, size_t, const char*, const struct tm*)
|
|
#if defined ISO11
|
|
function int timespec_get (struct timespec *, int)
|
|
#endif
|
|
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11
|
|
# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
|
|
symbol CLK_TCK
|
|
# endif
|
|
# if !defined XPG4 && !defined XPG42
|
|
# if !defined POSIX && !defined UNIX98
|
|
constant CLOCK_PROCESS_CPUTIME_ID
|
|
constant CLOCK_THREAD_CPUTIME_ID
|
|
# endif
|
|
|
|
type {struct itimerspec}
|
|
|
|
element {struct itimerspec} {struct timespec} it_interval
|
|
element {struct itimerspec} {struct timespec} it_value
|
|
|
|
constant CLOCK_REALTIME
|
|
constant TIMER_ABSTIME
|
|
# if !defined POSIX && !defined UNIX98
|
|
constant CLOCK_MONOTONIC
|
|
# endif
|
|
|
|
type clockid_t
|
|
type timer_t
|
|
# endif
|
|
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
type pid_t
|
|
type locale_t
|
|
tag {struct sigevent}
|
|
# endif
|
|
|
|
# if !defined XPG4 && !defined POSIX && !defined POSIX2008
|
|
variable int getdate_err
|
|
# endif
|
|
|
|
function {char*} asctime_r (const struct tm*, char*)
|
|
#if !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function int clock_getcpuclockid (pid_t, clockid_t*)
|
|
#endif
|
|
#if !defined XPG4 && !defined XPG42
|
|
function int clock_getres (clockid_t, struct timespec*)
|
|
function int clock_gettime (clockid_t, struct timespec*)
|
|
#endif
|
|
#if !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
|
|
function int clock_nanosleep (clockid_t, int, const struct timespec*, struct timespec*)
|
|
#endif
|
|
#if !defined XPG4 && !defined XPG42
|
|
function int clock_settime (clockid_t, const struct timespec*)
|
|
#endif
|
|
function {char*} ctime_r (const time_t*, char*)
|
|
# if !defined XPG4 && !defined POSIX && !defined POSIX2008
|
|
function {struct tm*} getdate (const char*)
|
|
# endif
|
|
function {struct tm*} gmtime_r (const time_t*, struct tm*)
|
|
function {struct tm*} localtime_r (const time_t*, struct tm*)
|
|
# if !defined XPG4 && !defined XPG42
|
|
function int nanosleep (const struct timespec*, struct timespec*)
|
|
# endif
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function size_t strftime_l (char*, size_t, const char*, const struct tm*, locale_t)
|
|
# endif
|
|
# if !defined POSIX && !defined POSIX2008
|
|
function {char*} strptime (const char*, const char*, struct tm*)
|
|
# endif
|
|
# if !defined XPG4 && !defined XPG42
|
|
function int timer_create (clockid_t, struct sigevent*, timer_t*)
|
|
function int timer_delete (timer_t)
|
|
function int timer_gettime (timer_t, struct itimerspec*)
|
|
function int timer_getoverrun (timer_t)
|
|
function int timer_settime (timer_t, int, const struct itimerspec*, struct itimerspec*)
|
|
# endif
|
|
function void tzset (void)
|
|
|
|
# if !defined POSIX && !defined POSIX2008
|
|
variable int daylight
|
|
variable {long int} timezone
|
|
# endif
|
|
variable {char*} tzname [2]
|
|
|
|
# ifndef POSIX
|
|
allow tm_*
|
|
# endif
|
|
allow clock_*
|
|
allow timer_*
|
|
allow it_*
|
|
allow tv_*
|
|
allow CLOCK_*
|
|
allow TIMER_*
|
|
allow *_t
|
|
allow sigevent
|
|
#endif
|