optimize includes, use stdlib instead of inttypes if we have it

(bzr r73)

8 files changed, 40 insertions, 21 deletions

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 <zlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#else
+# include <inttypes.h>
+#endif
+
 #include <glib/garray.h>
 #include <glib/gtypes.h>
-#include <zlib.h>
-#include <inttypes.h>
 
 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 <math.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <glib/gmem.h>
 
 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 <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-//#include <iostream.h>
-
 #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 <math.h>
+#include <stdio.h>
+#include <string.h>
 #include <glib/gmem.h>
 
 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 <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-
 #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 <inttypes.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#else
+# include <inttypes.h>
+#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 <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-//#include <iostream.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#else
+# include <inttypes.h>
+#endif
 
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#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 <cmath>
 #include <cstdio>
 #include <cstdlib>
-#include <inttypes.h>
 #include <cstring>
 #include <vector>