From 286823227c8c06e729dd939ec53b124c5c9afbc4 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Sat, 6 Feb 2010 21:08:56 +0200
Subject: [PATCH] Make int32_t available on all systems

Use AC_TYPE_INT32_T and include inttypes.h (if it exists) instead of
stdint.h for maximum portability.
---
 configure.ac | 1 +
 src/dump.c   | 1 -
 src/load.c   | 1 -
 src/utf.h    | 9 +++++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 95a207e..6bc9064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,7 @@ AC_PROG_LIBTOOL
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_INT32_T
 
 # Checks for library functions.
 
diff --git a/src/dump.c b/src/dump.c
index e8ae440..bc06dfd 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 #include <assert.h>
 
 #include <jansson.h>
diff --git a/src/load.c b/src/load.c
index bcc7aa7..baf3183 100644
--- a/src/load.c
+++ b/src/load.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <assert.h>
-#include <stdint.h>
 
 #include <jansson.h>
 #include "jansson_private.h"
diff --git a/src/utf.h b/src/utf.h
index 95abdc9..d0ae6e9 100644
--- a/src/utf.h
+++ b/src/utf.h
@@ -8,6 +8,15 @@
 #ifndef UTF_H
 #define UTF_H
 
+#include <config.h>
+
+#ifdef HAVE_INTTYPES_H
+/* inttypes.h includes stdint.h in a standard environment, so there's
+no need to include stdint.h separately. If inttypes.h doesn't define
+int32_t, it's defined in config.h. */
+#include <inttypes.h>
+#endif
+
 int utf8_encode(int codepoint, char *buffer, int *size);
 
 int utf8_check_first(char byte);
-- 
2.1.4