From cae46a08a948c1f6fa3736b5449b8d8c56d92d1f Mon Sep 17 00:00:00 2001 From: rwst Date: Mon, 6 Feb 2006 11:02:20 +0000 Subject: [PATCH] revert to using inttypes.h instead of stdint.h --- src/display/sp-canvas.h | 13 ++++++++++++- src/inkjar/jar.h | 8 +++++--- src/livarot/LivarotDefs.h | 8 +++++--- src/livarot/MyMath.h | 8 +++++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 905c9272f..a9bf2e4c3 100644 --- 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_INTTYPES_H +# include +#else +# ifdef HAVE_STDINT_H +# include +# endif +#endif + #include #include #include diff --git a/src/inkjar/jar.h b/src/inkjar/jar.h index 04abdd801..00a19258b 100644 --- a/src/inkjar/jar.h +++ b/src/inkjar/jar.h @@ -14,10 +14,12 @@ # include #endif -#ifdef HAVE_STDINT_H -# include -#else +#ifdef HAVE_INTTYPES_H # include +#else +# ifdef HAVE_STDINT_H +# include +# endif #endif #include diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index 3e59cdab3..d987bdef1 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -13,10 +13,12 @@ # include "config.h" #endif -#ifdef HAVE_STDINT_H -# include -#else +#ifdef HAVE_INTTYPES_H # include +#else +# ifdef HAVE_STDINT_H +# include +# endif #endif // error codes (mostly obsolete) diff --git a/src/livarot/MyMath.h b/src/livarot/MyMath.h index 371102f74..58f70f350 100644 --- a/src/livarot/MyMath.h +++ b/src/livarot/MyMath.h @@ -13,10 +13,12 @@ # include "config.h" #endif -#ifdef HAVE_STDINT_H -# include -#else +#ifdef HAVE_INTTYPES_H # include +#else +# ifdef HAVE_STDINT_H +# include +# endif #endif #ifdef HAVE_STDLIB_H -- 2.30.2