summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-01-03 23:43:39 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-01-03 23:43:39 +0000
commit30fa7301bccee2b8e827e8df7033f642951df779 (patch)
tree2420f8df51a9480a1239f231f8532f419ca0074e /src
parentb93b030de600eaf75ef28af3e65902c05d306af2 (diff)
downloadcoreutils-30fa7301bccee2b8e827e8df7033f642951df779.tar.xz
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/system.h20
1 files changed, 5 insertions, 15 deletions
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 <stdint.h>
#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 <ctype.h>