More consistent inttypes.h / stdint.h handling.

diff --git a/lib/human.h b/lib/human.h
index 4ec9f0da8602f1620291b58828ca712f2527aec0..84d745e3d305761b329c163a34e3e6b8e68f950f 100644 (file)
--- a/lib/human.h
+++ b/lib/human.h
@@ -7,6 +7,10 @@
 
 # if HAVE_INTTYPES_H
 #  include <inttypes.h>
+# else
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
 # endif
 
 /* A conservative bound on the maximum length of a human-readable string.

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 0f03ca174b7826ab70ac80634d648433d9a89183..6bddf9a871823a7c17f092ca203981750537b126 100644 (file)
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,5 +1,5 @@
 /* Convert string representation of a number into an intmax_t value.
-   Copyright 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #if HAVE_STDLIB_H

diff --git a/lib/tempname.c b/lib/tempname.c
index 43e9425f0af9b2fb89fff743c8aabb9c01676d22..e30872a708c8a7f919edd35bd22a980c13af6574 100644 (file)
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -61,6 +61,9 @@
 #if HAVE_STDINT_H || _LIBC
 # include <stdint.h>
 #endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
 
 #if HAVE_UNISTD_H || _LIBC
 # include <unistd.h>

diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 8937862c23117a24f2308f473e7c7da8ff0ac3a1..138be7cf6fbbc4da6bff80687e1775427236a36d 100644 (file)
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -1,5 +1,5 @@
 /* xstrtoimax.c -- A more useful interface to strtoimax.
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #define __strtol strtoimax

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 513855f14e5d8a6e429b4f1f5a9238a771b60643..a1ad32dd5d1300746df9868cb7420d64201acc37 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,5 +1,5 @@
 /* A more useful interface to strtol.
-   Copyright 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,8 +18,13 @@
 #ifndef XSTRTOL_H_
 # define XSTRTOL_H_ 1
 
+/* Get uintmax_t.  */
 # if HAVE_INTTYPES_H
-#  include <inttypes.h> /* for uintmax_t */
+#  include <inttypes.h>
+# else
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
 # endif
 
 # ifndef PARAMS

diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c
index 04d7cf98ae4c8adf5c601545f0fea38601362f71..3237f853341271ebba978b17e6ee27ea65060227 100644 (file)
--- a/lib/xstrtoumax.c
+++ b/lib/xstrtoumax.c
@@ -1,5 +1,5 @@
 /* xstrtoumax.c -- A more useful interface to strtoumax.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #define __strtol strtoumax