From 30fa7301bccee2b8e827e8df7033f642951df779 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 3 Jan 2005 23:43:39 +0000 Subject: * m4/jm-macros.m4 (gl_MACROS): Require gl_ULLONG_MAX. * m4/ullong_max.m4: New file. * src/system.h: Undo previous change; we now use Autoconf. --- src/system.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/system.h b/src/system.h index 9fd123812..27aff00d7 100644 --- a/src/system.h +++ b/src/system.h @@ -368,38 +368,28 @@ initialize_exit_failure (int status) # include #endif +#if ULONG_MAX < ULLONG_MAX +# define LONGEST_MODIFIER "ll" +#else +# define LONGEST_MODIFIER "l" +#endif #if PRI_MACROS_BROKEN # undef PRIdMAX # undef PRIoMAX # undef PRIuMAX # undef PRIxMAX #endif - -#if ULONG_MAX < ULLONG_MAX -# define LONGEST_MODIFIER "ll" -#else -# define LONGEST_MODIFIER "l" -#endif - #ifndef PRIdMAX # define PRIdMAX LONGEST_MODIFIER "d" -# defined USED_LONGEST_MODIFIER #endif #ifndef PRIoMAX # define PRIoMAX LONGEST_MODIFIER "o" -# defined USED_LONGEST_MODIFIER #endif #ifndef PRIuMAX # define PRIuMAX LONGEST_MODIFIER "u" -# defined USED_LONGEST_MODIFIER #endif #ifndef PRIxMAX # define PRIxMAX LONGEST_MODIFIER "x" -# defined USED_LONGEST_MODIFIER -#endif - -#if USED_LONGEST_MODIFIER && (!defined ULONG_MAX || !defined ULLONG_MAX) -# error "your PRI.MAX macros are broken and we don't work around it" #endif #include -- cgit v1.2.3-70-g09d2