diff options
| author | Ralf Stephan <ralf@ark.in-berlin.de> | 2006-02-06 11:02:20 +0000 |
|---|---|---|
| committer | rwst <rwst@users.sourceforge.net> | 2006-02-06 11:02:20 +0000 |
| commit | 60e3b0c88acbb204a4728e694fb2034e1a116023 (patch) | |
| tree | d91e3009bab9bd8ef98600f114b7bfe141b6419a /src | |
| parent | open Inkscape Preferences on doubleclick of toolbox button (more or less patch (diff) | |
| download | inkscape-60e3b0c88acbb204a4728e694fb2034e1a116023.tar.gz inkscape-60e3b0c88acbb204a4728e694fb2034e1a116023.zip | |
revert to using inttypes.h instead of stdint.h
(bzr r94)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/sp-canvas.h | 13 | ||||
| -rw-r--r-- | src/inkjar/jar.h | 8 | ||||
| -rw-r--r-- | src/livarot/LivarotDefs.h | 8 | ||||
| -rw-r--r-- | 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 <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 04abdd801..00a19258b 100644 --- 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 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 <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 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 <stdint.h> -#else +#ifdef HAVE_INTTYPES_H # include <inttypes.h> +#else +# ifdef HAVE_STDINT_H +# include <stdint.h> +# endif #endif #ifdef HAVE_STDLIB_H |