More type-determination fixes from Lars Hecking.

diff --git a/configure.in b/configure.in
index 0a3cb9904ca54e6eeca77fc267c5e2290911788d..f5df4041efb7eaee1c07af6abd8f7038fe981f29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -239,14 +239,18 @@ AC_DECL_SYS_SIGLIST
 
 dnl For MD5 and SHA1 on 64-bit systems
 AC_C_BIGENDIAN
-AC_CHECK_HEADERS(stdint.h)
+AC_CHECK_HEADERS(inttypes.h stdint.h)
 dnl This is the method autoconf-2.50's new AC_CHECK_TYPE macro uses.
 dnl We need to be backwards compatible to autoconf 2.13, though. -lh
 AC_MSG_CHECKING(for uint32_t)
 AC_TRY_COMPILE([
 #include <sys/types.h>
-#ifdef HAVE_STDINT_H
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #endif],
 [if ((uint32_t *) 0)
   return 0;

diff --git a/md5.h b/md5.h
index b6c5f1d0acf64920c65e44b74378b4a610378bbf..f825432366f8822b1870a203d0cf72950ba26bb2 100644 (file)
--- a/md5.h
+++ b/md5.h
@@ -28,10 +28,13 @@ documentation and/or software.
 
 #include "config.h"
 
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
+#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
 #else
-#  include <sys/types.h>
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 /* POINTER defines a generic pointer type */

diff --git a/sha1.h b/sha1.h
index 24d56841d544f98d11539505bce46346b82af112..838195587c989dba20fa71d47556e891ce18400c 100644 (file)
--- a/sha1.h
+++ b/sha1.h
@@ -10,10 +10,14 @@
 # define _SHA1_H
 
 #include "config.h"
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
+
+#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
 #else
-#  include <sys/types.h>
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #ifndef HAVE_UINT32_T