From 1c01f30b6b6a4b087e613f7122095058bfa36c54 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 28 Aug 2006 16:57:51 +0000 Subject: [PATCH] SCNX* macros don't exist. --- lib/ChangeLog | 5 ++++ lib/inttypes_.h | 86 --------------------------------------------------------- m4/ChangeLog | 5 ++++ m4/inttypes.m4 | 28 +++++++++---------- 4 files changed, 24 insertions(+), 100 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 9ed357b2a..7454d96d4 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-08-28 Bruno Haible + + * inttypes_.h (SCNX*): Remove definitions. + Reported by Eric Blake. + 2006-08-26 Bruno Haible * vasnprintf.c (EOVERFLOW): Remove definition. diff --git a/lib/inttypes_.h b/lib/inttypes_.h index c6e40ddc0..f9ff39a78 100644 --- a/lib/inttypes_.h +++ b/lib/inttypes_.h @@ -582,12 +582,6 @@ # define SCNx8 "hhx" # endif # endif -# if !defined SCNX8 || @PRI_MACROS_BROKEN@ -# undef SCNX8 -# ifdef UINT8_MAX -# define SCNX8 "hhX" -# endif -# endif # if !defined SCNd16 || @PRI_MACROS_BROKEN@ # undef SCNd16 # ifdef INT16_MAX @@ -618,12 +612,6 @@ # define SCNx16 "hx" # endif # endif -# if !defined SCNX16 || @PRI_MACROS_BROKEN@ -# undef SCNX16 -# ifdef UINT16_MAX -# define SCNX16 "hX" -# endif -# endif # if !defined SCNd32 || @PRI_MACROS_BROKEN@ # undef SCNd32 # ifdef INT32_MAX @@ -654,12 +642,6 @@ # define SCNx32 "x" # endif # endif -# if !defined SCNX32 || @PRI_MACROS_BROKEN@ -# undef SCNX32 -# ifdef UINT32_MAX -# define SCNX32 "X" -# endif -# endif # ifdef INT64_MAX # if INT64_MAX == LONG_MAX # define _SCN64_PREFIX "l" @@ -697,10 +679,6 @@ # undef SCNx64 # define SCNx64 _SCNu64_PREFIX "x" # endif -# if !defined SCNX64 || @PRI_MACROS_BROKEN@ -# undef SCNX64 -# define SCNX64 _SCNu64_PREFIX "X" -# endif # endif # if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@ @@ -723,10 +701,6 @@ # undef SCNxLEAST8 # define SCNxLEAST8 "hhx" # endif -# if !defined SCNXLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNXLEAST8 -# define SCNXLEAST8 "hhX" -# endif # if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@ # undef SCNdLEAST16 # define SCNdLEAST16 "hd" @@ -747,10 +721,6 @@ # undef SCNxLEAST16 # define SCNxLEAST16 "hx" # endif -# if !defined SCNXLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNXLEAST16 -# define SCNXLEAST16 "hX" -# endif # if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@ # undef SCNdLEAST32 # define SCNdLEAST32 "d" @@ -771,10 +741,6 @@ # undef SCNxLEAST32 # define SCNxLEAST32 "x" # endif -# if !defined SCNXLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNXLEAST32 -# define SCNXLEAST32 "X" -# endif # ifdef INT64_MAX # if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@ # undef SCNdLEAST64 @@ -798,10 +764,6 @@ # undef SCNxLEAST64 # define SCNxLEAST64 SCNx64 # endif -# if !defined SCNXLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNXLEAST64 -# define SCNXLEAST64 SCNX64 -# endif # endif # if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@ @@ -864,18 +826,6 @@ # define SCNxFAST8 "x" # endif # endif -# if !defined SCNXFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNXFAST8 -# if UINT_FAST8_MAX > UINT32_MAX -# define SCNXFAST8 SCNX64 -# elif UINT_FAST8_MAX == 0xffff -# define SCNXFAST8 "hX" -# elif UINT_FAST8_MAX == 0xff -# define SCNXFAST8 "hhX" -# else -# define SCNXFAST8 "X" -# endif -# endif # if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@ # undef SCNdFAST16 # if INT_FAST16_MAX > INT32_MAX @@ -926,16 +876,6 @@ # define SCNxFAST16 "x" # endif # endif -# if !defined SCNXFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNXFAST16 -# if UINT_FAST16_MAX > UINT32_MAX -# define SCNXFAST16 SCNX64 -# elif UINT_FAST16_MAX == 0xffff -# define SCNXFAST16 "hX" -# else -# define SCNXFAST16 "X" -# endif -# endif # if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@ # undef SCNdFAST32 # if INT_FAST32_MAX > INT32_MAX @@ -976,14 +916,6 @@ # define SCNxFAST32 "x" # endif # endif -# if !defined SCNXFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNXFAST32 -# if UINT_FAST32_MAX > UINT32_MAX -# define SCNXFAST32 SCNX64 -# else -# define SCNXFAST32 "X" -# endif -# endif # ifdef INT64_MAX # if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@ # undef SCNdFAST64 @@ -1007,10 +939,6 @@ # undef SCNxFAST64 # define SCNxFAST64 SCNx64 # endif -# if !defined SCNXFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNXFAST64 -# define SCNXFAST64 SCNX64 -# endif # endif # if !defined SCNdMAX || @PRI_MACROS_BROKEN@ @@ -1053,14 +981,6 @@ # define SCNxMAX "lx" # endif # endif -# if !defined SCNXMAX || @PRI_MACROS_BROKEN@ -# undef SCNXMAX -# if UINTMAX_MAX > UINT32_MAX -# define SCNXMAX SCNX64 -# else -# define SCNXMAX "lX" -# endif -# endif # if !defined SCNdPTR || @PRI_MACROS_BROKEN@ # undef SCNdPTR @@ -1092,12 +1012,6 @@ # define SCNxPTR @PRIPTR_PREFIX@ "x" # endif # endif -# if !defined SCNXPTR || @PRI_MACROS_BROKEN@ -# undef SCNXPTR -# ifdef UINTPTR_MAX -# define SCNXPTR @PRIPTR_PREFIX@ "X" -# endif -# endif #endif diff --git a/m4/ChangeLog b/m4/ChangeLog index 78ac13fa4..8ddf63ab3 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-08-28 Bruno Haible + + * inttypes.m4 (gl_INTTYPES_H): Don't test for the existence of SCNX* + macros. + 2006-08-22 Eric Blake * codeset.m4 (AM_LANGINFO_CODESET): Avoid compiler warning. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index c3d318148..f2c9eb5ea 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -89,42 +89,42 @@ const char *l = /* implicit string concatenation */ SCNd8 SCNi8 #endif #ifdef UINT8_MAX - SCNo8 SCNu8 SCNx8 SCNX8 + SCNo8 SCNu8 SCNx8 #endif #ifdef INT16_MAX SCNd16 SCNi16 #endif #ifdef UINT16_MAX - SCNo16 SCNu16 SCNx16 SCNX16 + SCNo16 SCNu16 SCNx16 #endif #ifdef INT32_MAX SCNd32 SCNi32 #endif #ifdef UINT32_MAX - SCNo32 SCNu32 SCNx32 SCNX32 + SCNo32 SCNu32 SCNx32 #endif #ifdef INT64_MAX SCNd64 SCNi64 #endif #ifdef UINT64_MAX - SCNo64 SCNu64 SCNx64 SCNX64 + SCNo64 SCNu64 SCNx64 #endif - SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8 SCNXLEAST8 - SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16 SCNXLEAST16 - SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32 SCNXLEAST32 + SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8 + SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16 + SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32 SCNdLEAST64 SCNiLEAST64 - SCNoLEAST64 SCNuLEAST64 SCNxLEAST64 SCNXLEAST64 - SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8 SCNXFAST8 - SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16 SCNXFAST16 - SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32 SCNXFAST32 + SCNoLEAST64 SCNuLEAST64 SCNxLEAST64 + SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8 + SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16 + SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32 SCNdFAST64 SCNiFAST64 - SCNoFAST64 SCNuFAST64 SCNxFAST64 SCNXFAST64 - SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX SCNXMAX + SCNoFAST64 SCNuFAST64 SCNxFAST64 + SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX #ifdef INTPTR_MAX SCNdPTR SCNiPTR #endif #ifdef UINTPTR_MAX - SCNoPTR SCNuPTR SCNxPTR SCNXPTR + SCNoPTR SCNuPTR SCNxPTR #endif ; ])], -- 2.11.0