mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +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.
170 lines
6.3 KiB
Plaintext
170 lines
6.3 KiB
Plaintext
#if !defined ISO && !defined POSIX && !defined XPG4 && !defined XPG42
|
|
type wchar_t
|
|
type wint_t
|
|
# if !defined ISO99 && !defined ISO11 && !defined POSIX2008
|
|
type wctype_t
|
|
# endif
|
|
type mbstate_t
|
|
# if !defined ISO99 && !defined ISO11
|
|
type FILE
|
|
# else
|
|
# define FILE __FILE
|
|
# endif
|
|
type size_t
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
type locale_t
|
|
# endif
|
|
tag {struct tm}
|
|
|
|
function wint_t btowc (int)
|
|
function int fwprintf (FILE*, const wchar_t*, ...)
|
|
function int fwscanf (FILE*, const wchar_t*, ...)
|
|
# if !defined ISO99 && !defined ISO11 && !defined POSIX2008
|
|
function int iswalnum (wint_t)
|
|
function int iswalpha (wint_t)
|
|
function int iswcntrl (wint_t)
|
|
function int iswdigit (wint_t)
|
|
function int iswgraph (wint_t)
|
|
function int iswlower (wint_t)
|
|
function int iswprint (wint_t)
|
|
function int iswpunct (wint_t)
|
|
function int iswspace (wint_t)
|
|
function int iswupper (wint_t)
|
|
function int iswxdigit (wint_t)
|
|
function int iswctype (wint_t, wctype_t)
|
|
# endif
|
|
function wint_t fgetwc (FILE*)
|
|
function {wchar_t*} fgetws (wchar_t*, int, FILE*)
|
|
function wint_t fputwc (wchar_t, FILE*)
|
|
function int fputws (const wchar_t*, FILE*)
|
|
function int fwide (FILE*, int)
|
|
function wint_t getwc (FILE*)
|
|
function wint_t getwchar (void)
|
|
function int mbsinit (const mbstate_t*)
|
|
function size_t mbrlen (const char*, size_t, mbstate_t*)
|
|
function size_t mbrtowc (wchar_t*, const char*, size_t, mbstate_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function size_t mbsnrtowcs (wchar_t*, const char**, size_t, size_t, mbstate_t*)
|
|
# endif
|
|
function size_t mbsrtowcs (wchar_t*, const char**, size_t, mbstate_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function {FILE*} open_wmemstream (wchar_t**, size_t*)
|
|
# endif
|
|
function wint_t putwc (wchar_t, FILE*)
|
|
function wint_t putwchar (wchar_t)
|
|
function int swprintf (wchar_t*, size_t, const wchar_t*, ...)
|
|
function int swscanf (const wchar_t*, const wchar_t*, ...)
|
|
# if !defined ISO99 && !defined ISO11 && !defined POSIX2008
|
|
function wint_t towlower (wint_t)
|
|
function wint_t towupper (wint_t)
|
|
# endif
|
|
function wint_t ungetwc (wint_t, FILE*)
|
|
function int vfwprintf (FILE*, const wchar_t*, __gnuc_va_list)
|
|
# ifndef UNIX98
|
|
function int vfwscanf (FILE*, const wchar_t*, __gnuc_va_list)
|
|
# endif
|
|
function int vwprintf (const wchar_t*, __gnuc_va_list)
|
|
# ifndef UNIX98
|
|
function int vwscanf (const wchar_t*, __gnuc_va_list)
|
|
# endif
|
|
function int vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list)
|
|
# ifndef UNIX98
|
|
function int vswscanf (const wchar_t*, const wchar_t*, __gnuc_va_list)
|
|
# endif
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function {wchar_t*} wcpcpy (wchar_t*, const wchar_t*)
|
|
function {wchar_t*} wcpncpy (wchar_t*, const wchar_t*, size_t)
|
|
# endif
|
|
function size_t wcrtomb (char*, wchar_t, mbstate_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function int wcscasecmp(const wchar_t*, const wchar_t*)
|
|
function int wcscasecmp_l(const wchar_t*, const wchar_t*, locale_t)
|
|
# endif
|
|
function {wchar_t*} wcscat (wchar_t*, const wchar_t*)
|
|
function {wchar_t*} wcschr (const wchar_t*, wchar_t)
|
|
function int wcscmp (const wchar_t*, const wchar_t*)
|
|
function int wcscoll (const wchar_t*, const wchar_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function int wcscoll_l (const wchar_t*, const wchar_t*, locale_t)
|
|
# endif
|
|
function {wchar_t*} wcscpy (wchar_t*, const wchar_t*)
|
|
function size_t wcscspn (const wchar_t*, const wchar_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function {wchar_t*} wcsdup (const wchar_t*)
|
|
# endif
|
|
function size_t wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*)
|
|
function size_t wcslen (const wchar_t*)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function int wcsncasecmp (const wchar_t*, const wchar_t*, size_t)
|
|
function int wcsncasecmp_l (const wchar_t*, const wchar_t*, size_t, locale_t)
|
|
# endif
|
|
function {wchar_t*} wcsncat (wchar_t*, const wchar_t*, size_t)
|
|
function int wcsncmp (const wchar_t*, const wchar_t*, size_t)
|
|
function {wchar_t*} wcsncpy (wchar_t*, const wchar_t*, size_t)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function size_t wcsnlen (const wchar_t*, size_t)
|
|
function size_t wcsnrtombs (char*, const wchar_t**, size_t, size_t, mbstate_t*)
|
|
# endif
|
|
function {wchar_t*} wcspbrk (const wchar_t*, const wchar_t*)
|
|
function {wchar_t*} wcsrchr (const wchar_t*, wchar_t)
|
|
function size_t wcsrtombs (char*, const wchar_t**, size_t, mbstate_t*)
|
|
function size_t wcsspn (const wchar_t*, const wchar_t*)
|
|
function {wchar_t*} wcsstr (const wchar_t*, const wchar_t*)
|
|
function double wcstod (const wchar_t*, wchar_t**)
|
|
# ifndef UNIX98
|
|
function float wcstof (const wchar_t*, wchar_t**)
|
|
function {long double} wcstold (const wchar_t*, wchar_t**)
|
|
# endif
|
|
function {wchar_t*} wcstok (wchar_t*, const wchar_t*, wchar_t**)
|
|
function {long int} wcstol (const wchar_t*, wchar_t**, int)
|
|
# ifndef UNIX98
|
|
function {long long int} wcstoll (const wchar_t*, wchar_t**, int)
|
|
# endif
|
|
function {unsigned long int} wcstoul (const wchar_t*, wchar_t**, int)
|
|
# ifndef UNIX98
|
|
function {unsigned long long int} wcstoull (const wchar_t*, wchar_t**, int)
|
|
# endif
|
|
# if defined UNIX98 || defined XOPEN2K
|
|
function {wchar_t*} wcswcs (const wchar_t*, const wchar_t*)
|
|
# endif
|
|
# if !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
|
function int wcswidth (const wchar_t*, size_t)
|
|
# endif
|
|
function size_t wcsxfrm (wchar_t*, const wchar_t*, size_t)
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
function size_t wcsxfrm_l (wchar_t*, const wchar_t*, size_t, locale_t)
|
|
# endif
|
|
function int wctob (wint_t)
|
|
# if !defined ISO99 && !defined ISO11 && !defined POSIX2008
|
|
function wctype_t wctype (const char*)
|
|
function int wcwidth (wchar_t)
|
|
# endif
|
|
function {wchar_t*} wmemchr (const wchar_t*, wchar_t, size_t)
|
|
function int wmemcmp (const wchar_t*, const wchar_t*, size_t)
|
|
function {wchar_t*} wmemcpy (wchar_t*, const wchar_t*, size_t)
|
|
function {wchar_t*} wmemmove (wchar_t*, const wchar_t*, size_t)
|
|
function {wchar_t*} wmemset (wchar_t*, wchar_t, size_t)
|
|
function int wprintf (const wchar_t*, ...)
|
|
function int wscanf (const wchar_t*, ...)
|
|
|
|
macro-int-constant WCHAR_MIN {promoted:wchar_t}
|
|
macro-int-constant WCHAR_MAX {promoted:wchar_t} >= 127
|
|
macro-constant WEOF {wint_t}
|
|
macro-constant NULL == 0
|
|
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11
|
|
allow-header ctype.h
|
|
allow-header stdio.h
|
|
allow-header stdarg.h
|
|
allow-header stdlib.h
|
|
allow-header string.h
|
|
allow-header stddef.h
|
|
allow-header time.h
|
|
#endif
|
|
|
|
allow wcs[abcdefghijklmnopqrstuvwxyz]*
|
|
#if !defined ISO && !defined ISO99 && !defined ISO11
|
|
allow *_t
|
|
#endif
|
|
#endif
|