From: rwst Date: Sat, 4 Feb 2006 09:52:07 +0000 (+0000) Subject: optimize includes, use stdlib instead of inttypes if we have it X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df6728ca61bffb9848165a4c65948bc11a215583;p=inkscape.git optimize includes, use stdlib instead of inttypes if we have it --- diff --git a/src/inkjar/jar.h b/src/inkjar/jar.h index 2340a74c7..04abdd801 100644 --- a/src/inkjar/jar.h +++ b/src/inkjar/jar.h @@ -6,10 +6,22 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_ZLIB_H +# include +#endif + +#ifdef HAVE_STDINT_H +# include +#else +# include +#endif + #include #include -#include -#include namespace Inkjar { diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp index fa128e1a7..f878c1bb3 100644 --- a/src/livarot/AlphaLigne.cpp +++ b/src/livarot/AlphaLigne.cpp @@ -8,9 +8,10 @@ */ #include "AlphaLigne.h" -//#include "Buffer.h" #include +#include +#include #include AlphaLigne::AlphaLigne(int iMin,int iMax) diff --git a/src/livarot/AlphaLigne.h b/src/livarot/AlphaLigne.h index b2686f6ba..d6684e0cf 100644 --- a/src/livarot/AlphaLigne.h +++ b/src/livarot/AlphaLigne.h @@ -10,12 +10,6 @@ #ifndef my_alpha_ligne #define my_alpha_ligne -#include -#include -#include -#include -//#include - #include "LivarotDefs.h" /* diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp index 52870f699..d6196d29e 100644 --- a/src/livarot/BitLigne.cpp +++ b/src/livarot/BitLigne.cpp @@ -10,6 +10,8 @@ #include "BitLigne.h" #include +#include +#include #include BitLigne::BitLigne(int ist,int ien,float iScale) diff --git a/src/livarot/BitLigne.h b/src/livarot/BitLigne.h index a1d5265f0..0bdb3a80e 100644 --- a/src/livarot/BitLigne.h +++ b/src/livarot/BitLigne.h @@ -10,11 +10,6 @@ #ifndef my_bit_ligne #define my_bit_ligne -#include -#include -#include -#include - #include "LivarotDefs.h" /* diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index bdb50b563..3e59cdab3 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -8,7 +8,16 @@ #ifndef my_defs #define my_defs -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_STDINT_H +# include +#else +# include +#endif // error codes (mostly obsolete) enum diff --git a/src/livarot/MyMath.h b/src/livarot/MyMath.h index 27e8089ec..371102f74 100644 --- a/src/livarot/MyMath.h +++ b/src/livarot/MyMath.h @@ -9,12 +9,19 @@ #ifndef my_math #define my_math -#include -#include -#include -#include -//#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_STDINT_H +# include +#else +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif typedef struct vec2 { diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h index dad27e17b..d0be5e44e 100644 --- a/src/livarot/Shape.h +++ b/src/livarot/Shape.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include