conformtest: Clean up / correct / expand C99 and C11 expectations.

13 files changed, 601 insertions, 560 deletions

diff --git a/ChangeLog b/ChangeLog
index 8634fb19de..fdacb2e3f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,291 @@
+2012-11-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/conformtest.pl: Preprocess allow-header data with -x c
+	instead of from stdin.
+	(@headers): Add stdalign.h, stdbool.h and stdnoreturn.h.
+	* conform/data/complex.h-data [C99-based standards] (cerf): Allow.
+	[C99-based standards] (cerfc): Likewise.
+	[C99-based standards] (cexp2): Likewise.
+	[C99-based standards] (cexpm1): Likewise.
+	[C99-based standards] (clog10): Likewise.
+	[C99-based standards] (clog1p): Likewise.
+	[C99-based standards] (clog2): Likewise.
+	[C99-based standards] (clgamma): Likewise.
+	[C99-based standards] (ctgamma): Likewise.
+	[C99-based standards] (cerff): Likewise.
+	[C99-based standards] (cerfcf): Likewise.
+	[C99-based standards] (cexp2f): Likewise.
+	[C99-based standards] (cexpm1f): Likewise.
+	[C99-based standards] (clog10f): Likewise.
+	[C99-based standards] (clog1pf): Likewise.
+	[C99-based standards] (clog2f): Likewise.
+	[C99-based standards] (clgammaf): Likewise.
+	[C99-based standards] (ctgammaf): Likewise.
+	[C99-based standards] (cerfl): Likewise.
+	[C99-based standards] (cerfcl): Likewise.
+	[C99-based standards] (cexp2l): Likewise.
+	[C99-based standards] (cexpm1l): Likewise.
+	[C99-based standards] (clog10l): Likewise.
+	[C99-based standards] (clog1pl): Likewise.
+	[C99-based standards] (clog2l): Likewise.
+	[C99-based standards] (clgammal): Likewise.
+	[C99-based standards] (ctgammal): Likewise.
+	* conform/data/inttypes.h-data [C99-based standards]: Include
+	stdint.h-data.  Remove all expectations for stdint.h contents.
+	[C99-based standards] (PRI*): Do not allow.
+	[C99-based standards] (SCN*): Likewise.
+	[C99-based standards] (*_t): Likewise.
+	[C99-based-standards] (PRId8): Expect macro.
+	[C99-based-standards] (PRIi8): Likewise.
+	[C99-based-standards] (PRIo8): Likewise.
+	[C99-based-standards] (PRIu8): Likewise.
+	[C99-based-standards] (PRIx8): Likewise.
+	[C99-based-standards] (PRIX8): Likewise.
+	[C99-based-standards] (SCNd8): Likewise.
+	[C99-based-standards] (SCNi8): Likewise.
+	[C99-based-standards] (SCNo8): Likewise.
+	[C99-based-standards] (SCNu8): Likewise.
+	[C99-based-standards] (SCNx8): Likewise.
+	[C99-based-standards] (PRIdLEAST8): Likewise.
+	[C99-based-standards] (PRIiLEAST8): Likewise.
+	[C99-based-standards] (PRIoLEAST8): Likewise.
+	[C99-based-standards] (PRIuLEAST8): Likewise.
+	[C99-based-standards] (PRIxLEAST8): Likewise.
+	[C99-based-standards] (PRIXLEAST8): Likewise.
+	[C99-based-standards] (SCNdLEAST8): Likewise.
+	[C99-based-standards] (SCNiLEAST8): Likewise.
+	[C99-based-standards] (SCNoLEAST8): Likewise.
+	[C99-based-standards] (SCNuLEAST8): Likewise.
+	[C99-based-standards] (SCNxLEAST8): Likewise.
+	[C99-based-standards] (PRIdFAST8): Likewise.
+	[C99-based-standards] (PRIiFAST8): Likewise.
+	[C99-based-standards] (PRIoFAST8): Likewise.
+	[C99-based-standards] (PRIuFAST8): Likewise.
+	[C99-based-standards] (PRIxFAST8): Likewise.
+	[C99-based-standards] (PRIXFAST8): Likewise.
+	[C99-based-standards] (SCNdFAST8): Likewise.
+	[C99-based-standards] (SCNiFAST8): Likewise.
+	[C99-based-standards] (SCNoFAST8): Likewise.
+	[C99-based-standards] (SCNuFAST8): Likewise.
+	[C99-based-standards] (SCNxFAST8): Likewise.
+	[C99-based-standards] (PRId16): Likewise.
+	[C99-based-standards] (PRIi16): Likewise.
+	[C99-based-standards] (PRIo16): Likewise.
+	[C99-based-standards] (PRIu16): Likewise.
+	[C99-based-standards] (PRIx16): Likewise.
+	[C99-based-standards] (PRIX16): Likewise.
+	[C99-based-standards] (SCNd16): Likewise.
+	[C99-based-standards] (SCNi16): Likewise.
+	[C99-based-standards] (SCNo16): Likewise.
+	[C99-based-standards] (SCNu16): Likewise.
+	[C99-based-standards] (SCNx16): Likewise.
+	[C99-based-standards] (PRIdLEAST16): Likewise.
+	[C99-based-standards] (PRIiLEAST16): Likewise.
+	[C99-based-standards] (PRIoLEAST16): Likewise.
+	[C99-based-standards] (PRIuLEAST16): Likewise.
+	[C99-based-standards] (PRIxLEAST16): Likewise.
+	[C99-based-standards] (PRIXLEAST16): Likewise.
+	[C99-based-standards] (SCNdLEAST16): Likewise.
+	[C99-based-standards] (SCNiLEAST16): Likewise.
+	[C99-based-standards] (SCNoLEAST16): Likewise.
+	[C99-based-standards] (SCNuLEAST16): Likewise.
+	[C99-based-standards] (SCNxLEAST16): Likewise.
+	[C99-based-standards] (PRIdFAST16): Likewise.
+	[C99-based-standards] (PRIiFAST16): Likewise.
+	[C99-based-standards] (PRIoFAST16): Likewise.
+	[C99-based-standards] (PRIuFAST16): Likewise.
+	[C99-based-standards] (PRIxFAST16): Likewise.
+	[C99-based-standards] (PRIXFAST16): Likewise.
+	[C99-based-standards] (SCNdFAST16): Likewise.
+	[C99-based-standards] (SCNiFAST16): Likewise.
+	[C99-based-standards] (SCNoFAST16): Likewise.
+	[C99-based-standards] (SCNuFAST16): Likewise.
+	[C99-based-standards] (SCNxFAST16): Likewise.
+	[C99-based-standards] (PRId32): Likewise.
+	[C99-based-standards] (PRIi32): Likewise.
+	[C99-based-standards] (PRIo32): Likewise.
+	[C99-based-standards] (PRIu32): Likewise.
+	[C99-based-standards] (PRIx32): Likewise.
+	[C99-based-standards] (PRIX32): Likewise.
+	[C99-based-standards] (SCNd32): Likewise.
+	[C99-based-standards] (SCNi32): Likewise.
+	[C99-based-standards] (SCNo32): Likewise.
+	[C99-based-standards] (SCNu32): Likewise.
+	[C99-based-standards] (SCNx32): Likewise.
+	[C99-based-standards] (PRIdLEAST32): Likewise.
+	[C99-based-standards] (PRIiLEAST32): Likewise.
+	[C99-based-standards] (PRIoLEAST32): Likewise.
+	[C99-based-standards] (PRIuLEAST32): Likewise.
+	[C99-based-standards] (PRIxLEAST32): Likewise.
+	[C99-based-standards] (PRIXLEAST32): Likewise.
+	[C99-based-standards] (SCNdLEAST32): Likewise.
+	[C99-based-standards] (SCNiLEAST32): Likewise.
+	[C99-based-standards] (SCNoLEAST32): Likewise.
+	[C99-based-standards] (SCNuLEAST32): Likewise.
+	[C99-based-standards] (SCNxLEAST32): Likewise.
+	[C99-based-standards] (PRIdFAST32): Likewise.
+	[C99-based-standards] (PRIiFAST32): Likewise.
+	[C99-based-standards] (PRIoFAST32): Likewise.
+	[C99-based-standards] (PRIuFAST32): Likewise.
+	[C99-based-standards] (PRIxFAST32): Likewise.
+	[C99-based-standards] (PRIXFAST32): Likewise.
+	[C99-based-standards] (SCNdFAST32): Likewise.
+	[C99-based-standards] (SCNiFAST32): Likewise.
+	[C99-based-standards] (SCNoFAST32): Likewise.
+	[C99-based-standards] (SCNuFAST32): Likewise.
+	[C99-based-standards] (SCNxFAST32): Likewise.
+	[C99-based-standards] (PRId64): Likewise.
+	[C99-based-standards] (PRIi64): Likewise.
+	[C99-based-standards] (PRIo64): Likewise.
+	[C99-based-standards] (PRIu64): Likewise.
+	[C99-based-standards] (PRIx64): Likewise.
+	[C99-based-standards] (PRIX64): Likewise.
+	[C99-based-standards] (SCNd64): Likewise.
+	[C99-based-standards] (SCNi64): Likewise.
+	[C99-based-standards] (SCNo64): Likewise.
+	[C99-based-standards] (SCNu64): Likewise.
+	[C99-based-standards] (SCNx64): Likewise.
+	[C99-based-standards] (PRIdLEAST64): Likewise.
+	[C99-based-standards] (PRIiLEAST64): Likewise.
+	[C99-based-standards] (PRIoLEAST64): Likewise.
+	[C99-based-standards] (PRIuLEAST64): Likewise.
+	[C99-based-standards] (PRIxLEAST64): Likewise.
+	[C99-based-standards] (PRIXLEAST64): Likewise.
+	[C99-based-standards] (SCNdLEAST64): Likewise.
+	[C99-based-standards] (SCNiLEAST64): Likewise.
+	[C99-based-standards] (SCNoLEAST64): Likewise.
+	[C99-based-standards] (SCNuLEAST64): Likewise.
+	[C99-based-standards] (SCNxLEAST64): Likewise.
+	[C99-based-standards] (PRIdFAST64): Likewise.
+	[C99-based-standards] (PRIiFAST64): Likewise.
+	[C99-based-standards] (PRIoFAST64): Likewise.
+	[C99-based-standards] (PRIuFAST64): Likewise.
+	[C99-based-standards] (PRIxFAST64): Likewise.
+	[C99-based-standards] (PRIXFAST64): Likewise.
+	[C99-based-standards] (SCNdFAST64): Likewise.
+	[C99-based-standards] (SCNiFAST64): Likewise.
+	[C99-based-standards] (SCNoFAST64): Likewise.
+	[C99-based-standards] (SCNuFAST64): Likewise.
+	[C99-based-standards] (SCNxFAST64): Likewise.
+	[C99-based-standards] (PRIdMAX): Likewise.
+	[C99-based-standards] (PRIiMAX): Likewise.
+	[C99-based-standards] (PRIoMAX): Likewise.
+	[C99-based-standards] (PRIuMAX): Likewise.
+	[C99-based-standards] (PRIxMAX): Likewise.
+	[C99-based-standards] (PRIXMAX): Likewise.
+	[C99-based-standards] (SCNdMAX): Likewise.
+	[C99-based-standards] (SCNiMAX): Likewise.
+	[C99-based-standards] (SCNoMAX): Likewise.
+	[C99-based-standards] (SCNuMAX): Likewise.
+	[C99-based-standards] (SCNxMAX): Likewise.
+	[C99-based-standards] (PRIdPTR): Likewise.
+	[C99-based-standards] (PRIiPTR): Likewise.
+	[C99-based-standards] (PRIoPTR): Likewise.
+	[C99-based-standards] (PRIuPTR): Likewise.
+	[C99-based-standards] (PRIxPTR): Likewise.
+	[C99-based-standards] (PRIXPTR): Likewise.
+	[C99-based-standards] (SCNdPTR): Likewise.
+	[C99-based-standards] (SCNiPTR): Likewise.
+	[C99-based-standards] (SCNoPTR): Likewise.
+	[C99-based-standards] (SCNuPTR): Likewise.
+	[C99-based-standards] (SCNxPTR): Likewise.
+	* conform/data/iso646.h-data [ISO C standards] (*_t): Do not
+	allow.
+	* conform/data/stdint.h-data: Update comments to clarify
+	requirements.
+	[C99-based standards] (INT8_MIN): Use macro-int-constant.  Specify
+	type.
+	[C99-based standards] (INT8_MAX): Likewise.
+	[C99-based standards] (INT16_MIN): Likewise.
+	[C99-based standards] (INT16_MAX): Likewise.
+	[C99-based standards] (INT32_MIN): Likewise.
+	[C99-based standards] (INT32_MAX): Likewise.
+	[C99-based standards] (INT64_MIN): Likewise.
+	[C99-based standards] (INT64_MAX): Likewise.
+	[C99-based standards] (UINT8_MAX): Likewise.
+	[C99-based standards] (UINT16_MAX): Likewise.
+	[C99-based standards] (UINT32_MAX): Likewise.
+	[C99-based standards] (UINT64_MAX): Likewise.
+	[C99-based standards] (INT_LEAST8_MIN): Likewise.
+	[C99-based standards] (INT_LEAST8_MAX): Likewise.
+	[C99-based standards] (INT_LEAST16_MIN): Likewise.
+	[C99-based standards] (INT_LEAST16_MAX): Likewise.
+	[C99-based standards] (INT_LEAST32_MIN): Likewise.
+	[C99-based standards] (INT_LEAST32_MAX): Likewise.
+	[C99-based standards] (INT_LEAST64_MIN): Likewise.
+	[C99-based standards] (INT_LEAST64_MAX): Likewise.
+	[C99-based standards] (UINT_LEAST8_MAX): Likewise.
+	[C99-based standards] (UINT_LEAST16_MAX): Likewise.
+	[C99-based standards] (UINT_LEAST32_MAX): Likewise.
+	[C99-based standards] (UINT_LEAST64_MAX): Likewise.
+	[C99-based standards] (INT_FAST8_MIN): Likewise.
+	[C99-based standards] (INT_FAST8_MAX): Likewise.
+	[C99-based standards] (INT_FAST16_MIN): Likewise.
+	[C99-based standards] (INT_FAST16_MAX): Likewise.
+	[C99-based standards] (INT_FAST32_MIN): Likewise.
+	[C99-based standards] (INT_FAST32_MAX): Likewise.
+	[C99-based standards] (INT_FAST64_MIN): Likewise.
+	[C99-based standards] (INT_FAST64_MAX): Likewise.
+	[C99-based standards] (UINT_FAST8_MAX): Likewise.
+	[C99-based standards] (UINT_FAST16_MAX): Likewise.
+	[C99-based standards] (UINT_FAST32_MAX): Likewise.
+	[C99-based standards] (UINT_FAST64_MAX): Likewise.
+	[C99-based standards] (INTPTR_MIN): Likewise.
+	[C99-based standards] (INTPTR_MAX): Likewise.
+	[C99-based standards] (UINTPTR_MAX): Likewise.
+	[C99-based standards] (INTMAX_MIN): Likewise.
+	[C99-based standards] (INTMAX_MAX): Likewise.
+	[C99-based standards] (UINTMAX_MAX): Likewise.
+	[C99-based standards] (PTRDIFF_MIN): Likewise.
+	[C99-based standards] (PTRDIFF_MAX): Likewise.
+	[C99-based standards] (SIG_ATOMIC_MAX): Likewise.
+	[C99-based standards] (SIZE_MAX): Likewise.
+	[C99-based standards] (WCHAR_MAX): Likewise.
+	[C99-based standards] (WINT_MAX): Likewise.
+	[C99-based standards] (SIG_ATOMIC_MIN): Likewise.  Do not specify
+	constraint on value.
+	[C99-based standards] (WCHAR_MIN): Likewise.
+	[C99-based standards] (WINT_MIN): Likewise.
+	[C99-based standards] (*_t): Allow.
+	* conform/data/tgmath.h-data [XOPEN2K || POSIX2008]: Change
+	condition to [!ISO && !POSIX && !XPG3 && !XPG4 && !UNIX98].
+	Include math.h-data and complex.h-data.  Remove all expectations
+	of math.h and complex.h contents.
+	* conform/data/uchar.h-data [ISO11] (c16rtomb): Remove stray "16"
+	at end of line.
+	* conform/data/wchar.h-data [!ISO && !POSIX && !XPG3 && !XPG4]
+	(struct tm): Expect tag.
+	[C99-based-standards] (wcstof): Expect function.
+	[C99-based-standards] (wcstold): Likewise.
+	[C99-based-standards] (wcstoll): Likewise.
+	[C99-based-standards] (wcstoull): Likewise.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (WCHAR_MIN): Use
+	macro-int-constant.  Specify type.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (WCHAR_MAX): Likewise.  Specify
+	constraint on value.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (WEOF): Use macro-constant.
+	Specify type.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (NULL): Use macro-constant.
+	Specify value.
+	[ISO C standards]: Do not allow headers.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (wcs*): Change to
+	wcs[abcdefghijklmnopqrstuvwxyz]*.
+	[ISO C standards] (*_t): Do not allow.
+	* conform/data/wctype.h-data [C99-based standards] (iswblank):
+	Expect function.
+	[XOPEN2K8 || POSIX2008] (iswblank_l): Likewise.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (WEOF): Use macro-constant.
+	Specify type.
+	[ISO C standards]: Do not allow headers.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (is*): Change to
+	is[abcdefghijklmnopqrstuvwxyz]*.
+	[!ISO && !POSIX && !XPG3 && !XPG4] (to*): Change to
+	to[abcdefghijklmnopqrstuvwxyz]*.
+	[ISO C standards] (*_t): Do not allow.
+	* conform/data/stdalign.h-data: New file.
+	* conform/data/stdbool.h-data: Likewise.
+	* conform/data/stdnoreturn.h-data: Likewise.
+
 2012-11-07  Andreas Jaeger  <aj@suse.de>
 
 	[BZ #14809]
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index af21941596..ec2e9c308b 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -20,16 +20,16 @@ if (@headers == ()) {
 	      "sys/stat.h", "sys/socket.h", "sys/shm.h", "sys/sem.h",
 	      "sys/select.h", "sys/resource.h", "sys/msg.h", "sys/mman.h",
 	      "sys/ipc.h", "syslog.h", "stropts.h", "strings.h", "string.h",
-	      "stdlib.h", "stdio.h", "stdint.h", "stddef.h", "stdarg.h",
-	      "spawn.h", "signal.h", "setjmp.h", "semaphore.h", "search.h",
-	      "sched.h", "regex.h", "pwd.h", "pthread.h", "poll.h",
-	      "nl_types.h", "netinet/tcp.h", "netinet/in.h", "net/if.h",
-	      "netdb.h", "ndbm.h", "mqueue.h", "monetary.h", "math.h",
-	      "locale.h", "libgen.h", "limits.h", "langinfo.h", "iso646.h",
-	      "inttypes.h", "iconv.h", "grp.h", "glob.h", "ftw.h", "fnmatch.h",
-	      "fmtmsg.h", "float.h", "fenv.h", "fcntl.h", "errno.h", "dlfcn.h",
-	      "dirent.h", "ctype.h", "cpio.h", "complex.h", "assert.h",
-	      "arpa/inet.h", "aio.h");
+	      "stdnoreturn.h", "stdlib.h", "stdio.h", "stdint.h", "stddef.h",
+	      "stdbool.h", "stdarg.h", "stdalign.h", "spawn.h", "signal.h",
+	      "setjmp.h", "semaphore.h", "search.h", "sched.h", "regex.h",
+	      "pwd.h", "pthread.h", "poll.h", "nl_types.h", "netinet/tcp.h",
+	      "netinet/in.h", "net/if.h", "netdb.h", "ndbm.h", "mqueue.h",
+	      "monetary.h", "math.h", "locale.h", "libgen.h", "limits.h",
+	      "langinfo.h", "iso646.h", "inttypes.h", "iconv.h", "grp.h",
+	      "glob.h", "ftw.h", "fnmatch.h", "fmtmsg.h", "float.h", "fenv.h",
+	      "fcntl.h", "errno.h", "dlfcn.h", "dirent.h", "ctype.h", "cpio.h",
+	      "complex.h", "assert.h", "arpa/inet.h", "aio.h");
 }
 
 $CFLAGS{"ISO"} = "-ansi";
@@ -777,7 +777,7 @@ while ($#headers >= 0) {
   while ($#allowheader >= 0) {
     my($ah) = pop @allowheader;
 
-    open (ALLOW, "$CC -E -D$standard - < data/$ah-data |");
+    open (ALLOW, "$CC -E -D$standard -x c data/$ah-data |");
     acontrol: while (<ALLOW>) {
       chop;
       next acontrol if (/^#/);
diff --git a/conform/data/complex.h-data b/conform/data/complex.h-data
index 8abfb507b9..7de888f81b 100644
--- a/conform/data/complex.h-data
+++ b/conform/data/complex.h-data
@@ -79,4 +79,35 @@ macro-function {double complex} CMPLX (double, double)
 macro-function {float complex} CMPLXF (float, float)
 macro-function {long double complex} CMPLXL (long double, long double)
 # endif
+
+allow cerf
+allow cerfc
+allow cexp2
+allow cexpm1
+allow clog10
+allow clog1p
+allow clog2
+allow clgamma
+allow ctgamma
+
+allow cerff
+allow cerfcf
+allow cexp2f
+allow cexpm1f
+allow clog10f
+allow clog1pf
+allow clog2f
+allow clgammaf
+allow ctgammaf
+
+allow cerfl
+allow cerfcl
+allow cexp2l
+allow cexpm1l
+allow clog10l
+allow clog1pl
+allow clog2l
+allow clgammal
+allow ctgammal
+
 #endif
diff --git a/conform/data/inttypes.h-data b/conform/data/inttypes.h-data
index 5ef54f6ebe..8c076dff88 100644
--- a/conform/data/inttypes.h-data
+++ b/conform/data/inttypes.h-data
@@ -1,14 +1,5 @@
 #if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
-type int8_t
-type int16_t
-type int32_t
-type int64_t
-type uint8_t
-type uint16_t
-type uint32_t
-type uint64_t
-type intptr_t
-type uintptr_t
+#include "stdint.h-data"
 
 type imaxdiv_t
 element imaxdiv_t intmax_t rem
@@ -21,125 +12,166 @@ function uintmax_t strtoumax (const char*, char**, int)
 function intmax_t wcstoimax (const __gwchar_t*, __gwchar_t**, int)
 function uintmax_t wcstoumax (const __gwchar_t*, __gwchar_t**, int)
 
-allow PRI*
-allow SCN*
-allow *_t
+macro PRId8
+macro PRIi8
+macro PRIo8
+macro PRIu8
+macro PRIx8
+macro PRIX8
+macro SCNd8
+macro SCNi8
+macro SCNo8
+macro SCNu8
+macro SCNx8
+macro PRIdLEAST8
+macro PRIiLEAST8
+macro PRIoLEAST8
+macro PRIuLEAST8
+macro PRIxLEAST8
+macro PRIXLEAST8
+macro SCNdLEAST8
+macro SCNiLEAST8
+macro SCNoLEAST8
+macro SCNuLEAST8
+macro SCNxLEAST8
+macro PRIdFAST8
+macro PRIiFAST8
+macro PRIoFAST8
+macro PRIuFAST8
+macro PRIxFAST8
+macro PRIXFAST8
+macro SCNdFAST8
+macro SCNiFAST8
+macro SCNoFAST8
+macro SCNuFAST8
+macro SCNxFAST8
+
+macro PRId16
+macro PRIi16
+macro PRIo16
+macro PRIu16
+macro PRIx16
+macro PRIX16
+macro SCNd16
+macro SCNi16
+macro SCNo16
+macro SCNu16
+macro SCNx16
+macro PRIdLEAST16
+macro PRIiLEAST16
+macro PRIoLEAST16
+macro PRIuLEAST16
+macro PRIxLEAST16
+macro PRIXLEAST16
+macro SCNdLEAST16
+macro SCNiLEAST16
+macro SCNoLEAST16
+macro SCNuLEAST16
+macro SCNxLEAST16
+macro PRIdFAST16
+macro PRIiFAST16
+macro PRIoFAST16
+macro PRIuFAST16
+macro PRIxFAST16
+macro PRIXFAST16
+macro SCNdFAST16
+macro SCNiFAST16
+macro SCNoFAST16
+macro SCNuFAST16
+macro SCNxFAST16
+
+macro PRId32
+macro PRIi32
+macro PRIo32
+macro PRIu32
+macro PRIx32
+macro PRIX32
+macro SCNd32
+macro SCNi32
+macro SCNo32
+macro SCNu32
+macro SCNx32
+macro PRIdLEAST32
+macro PRIiLEAST32
+macro PRIoLEAST32
+macro PRIuLEAST32
+macro PRIxLEAST32
+macro PRIXLEAST32
+macro SCNdLEAST32
+macro SCNiLEAST32
+macro SCNoLEAST32
+macro SCNuLEAST32
+macro SCNxLEAST32
+macro PRIdFAST32
+macro PRIiFAST32
+macro PRIoFAST32
+macro PRIuFAST32
+macro PRIxFAST32
+macro PRIXFAST32
+macro SCNdFAST32
+macro SCNiFAST32
+macro SCNoFAST32
+macro SCNuFAST32
+macro SCNxFAST32
+
+macro PRId64
+macro PRIi64
+macro PRIo64
+macro PRIu64
+macro PRIx64
+macro PRIX64
+macro SCNd64
+macro SCNi64
+macro SCNo64
+macro SCNu64
+macro SCNx64
+macro PRIdLEAST64
+macro PRIiLEAST64
+macro PRIoLEAST64
+macro PRIuLEAST64
+macro PRIxLEAST64
+macro PRIXLEAST64
+macro SCNdLEAST64
+macro SCNiLEAST64
+macro SCNoLEAST64
+macro SCNuLEAST64
+macro SCNxLEAST64
+macro PRIdFAST64
+macro PRIiFAST64
+macro PRIoFAST64
+macro PRIuFAST64
+macro PRIxFAST64
+macro PRIXFAST64
+macro SCNdFAST64
+macro SCNiFAST64
+macro SCNoFAST64
+macro SCNuFAST64
+macro SCNxFAST64
+
+macro PRIdMAX
+macro PRIiMAX
+macro PRIoMAX
+macro PRIuMAX
+macro PRIxMAX
+macro PRIXMAX
+macro SCNdMAX
+macro SCNiMAX
+macro SCNoMAX
+macro SCNuMAX
+macro SCNxMAX
+
+macro PRIdPTR
+macro PRIiPTR
+macro PRIoPTR
+macro PRIuPTR
+macro PRIxPTR
+macro PRIXPTR
+macro SCNdPTR
+macro SCNiPTR
+macro SCNoPTR
+macro SCNuPTR
+macro SCNxPTR
 
-// Now the content of <stdint.h>.  Update this whenever <stdint.h> changed.
-type int8_t
-type int16_t
-type int32_t
-type int64_t
-type uint8_t
-type uint16_t
-type uint32_t
-type uint64_t
-
-type int_least8_t
-type int_least16_t
-type int_least32_t
-type int_least64_t
-type uint_least8_t
-type uint_least16_t
-type uint_least32_t
-type uint_least64_t
-
-type int_fast8_t
-type int_fast16_t
-type int_fast32_t
-type int_fast64_t
-type uint_fast8_t
-type uint_fast16_t
-type uint_fast32_t
-type uint_fast64_t
-
-type intptr_t
-type uintptr_t
-
-type intmax_t
-type uintmax_t
-
-constant INT8_MIN == -128
-constant INT8_MAX == 127
-constant INT16_MIN == -32768
-constant INT16_MAX == 32767
-constant INT32_MIN == -214748364