revert to using inttypes.h instead of stdint.h

diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 905c9272f8538d9557a50647ac7ab2b4e53cad23..a9bf2e4c35fe7bb0aceca27622aea3905cbff099 100644 (file)
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -15,7 +15,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <stdint.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+
 #include <glib/gtypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkgc.h>

diff --git a/src/inkjar/jar.h b/src/inkjar/jar.h
index 04abdd80131f4c5fad0045db7b2e72542cfc211a..00a19258b2cccf8660612df149656b9c20d56ec5 100644 (file)
--- a/src/inkjar/jar.h
+++ b/src/inkjar/jar.h
@@ -14,10 +14,12 @@
 # include <zlib.h>
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#else
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include <glib/garray.h>

diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h
index 3e59cdab377e19d3bcaa1e41e30e65f5a5fca40e..d987bdef18588e885c95a8e56175a46211f82fe2 100644 (file)
--- a/src/livarot/LivarotDefs.h
+++ b/src/livarot/LivarotDefs.h
@@ -13,10 +13,12 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#else
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 // error codes (mostly obsolete)

diff --git a/src/livarot/MyMath.h b/src/livarot/MyMath.h
index 371102f745ef532ca31e680324f75a7e3973aceb..58f70f3500668b90eb63579645fd5d6fe77b8dc4 100644 (file)
--- a/src/livarot/MyMath.h
+++ b/src/livarot/MyMath.h
@@ -13,10 +13,12 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#else
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #ifdef HAVE_STDLIB_H