X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Futf.h;h=0c3ab3136fc2d07d8da164c3e15be0018fe13b53;hb=fa7c2ea070672d05b34b6341142a193e9a7d0a8c;hp=e2d6c59082a4b5be329ea5ff6a2918a8c3dcb40a;hpb=781bda140418821ad79ef513b0fd8cfbc0ce552e;p=jansson.git

diff --git a/src/utf.h b/src/utf.h
index e2d6c59..0c3ab31 100644
--- a/src/utf.h
+++ b/src/utf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
  *
  * Jansson is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -10,18 +10,23 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #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>
-#else
+#endif /* HAVE_INTTYPES_H */
+
+#else /* !HAVE_CONFIG_H */
 #ifdef _WIN32
 typedef int int32_t;
-#endif
-#endif
+#else /* !_WIN32 */
+/* Assume a standard environment */
+#include <inttypes.h>
+#endif /* _WIN32 */
+
+#endif /* HAVE_CONFIG_H */
 
 int utf8_encode(int codepoint, char *buffer, int *size);