aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2010-02-06 21:08:56 +0200
committerPetri Lehtinen <petri@digip.org>2010-02-06 21:11:41 +0200
commit286823227c8c06e729dd939ec53b124c5c9afbc4 (patch)
treec72b14edf973292ff792b9c24081e57af882f5c1 /src
parent08dc8d9bafcb13bb1541894918f4a394e644e6e1 (diff)
downloadjansson-286823227c8c06e729dd939ec53b124c5c9afbc4.zip
jansson-286823227c8c06e729dd939ec53b124c5c9afbc4.tar.gz
jansson-286823227c8c06e729dd939ec53b124c5c9afbc4.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/dump.c1
-rw-r--r--src/load.c1
-rw-r--r--src/utf.h9
3 files changed, 9 insertions, 2 deletions
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);