Applying fixes for gcc 4.3 build issues (closes LP: #169115)

(bzr r4629)

8 files changed, 28 insertions, 6 deletions

diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
index d6196d29e..c4c134615 100644
--- a/src/livarot/BitLigne.cpp
+++ b/src/livarot/BitLigne.cpp
@@ -10,8 +10,11 @@
 #include "BitLigne.h"
 
 #include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <string>
+#include <cmath>
+#include <cstdio>
 #include <glib/gmem.h>
 
 BitLigne::BitLigne(int ist,int ien,float iScale)
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 276c9b260..7bc1114a3 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -13,6 +13,10 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+#include <cstdio>
+
 #include "Path.h"
 #include "style.h"
 #include "livarot/path-description.h"
@@ -25,11 +29,11 @@ void  Path::DashPolyline(float head,float tail,float body,int nbD,float *dashs,b
 
   std::vector<path_lineto> orig_pts = pts;
   pts.clear();
-  
+
   int       lastMI=-1;
   int curP = 0;
   int lastMP = -1;
-  
+
   for (int i = 0; i < int(orig_pts.size()); i++) {
     if ( orig_pts[curP].isMoveTo == polyline_moveto ) {
       if ( lastMI >= 0 && lastMI < i-1 ) { // au moins 2 points
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index c694cdd27..d03940f2f 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff --git a/src/livarot/ShapeDraw.cpp b/src/livarot/ShapeDraw.cpp
index 07e46afc7..f3a8dbd1f 100644
--- a/src/livarot/ShapeDraw.cpp
+++ b/src/livarot/ShapeDraw.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "Shape.h"
 //#include <ApplicationServices/ApplicationServices.h>
 
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index 12b8d8491..2b398ef7c 100644
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -11,6 +11,9 @@
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
 #include <glib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 /*
  * polygon offset and polyline to path reassembling (when using back data)
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index 70f33af2c..18f8e3a69 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index afa3b6032..959143138 100644
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -2,7 +2,7 @@
  *  \file livarot/float-line.cpp
  *
  * Implementation of coverage with floating-point values.
- * 
+ *
  *  \author Fred
  *
  *  public domain
@@ -14,6 +14,7 @@
 #endif
 #include "livarot/float-line.h"
 #include "livarot/int-line.h"
+#include <cstdio>
 
 FloatLigne::FloatLigne()
 {
@@ -23,7 +24,6 @@ FloatLigne::FloatLigne()
 
 FloatLigne::~FloatLigne()
 {
-    
 }
 
 /// Reset the line to  empty (boundaries and runs).
diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index fabe8d01c..c1e388fe2 100644
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -11,6 +11,10 @@
 
 #include <glib/gmem.h>
 #include <cmath>
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include "livarot/int-line.h"
 #include "livarot/float-line.h"
 #include "livarot/BitLigne.h"