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

(bzr r4629)

8 files changed, 32 insertions, 6 deletions

diff --git a/src/svg/gnome-canvas-bpath-util.cpp b/src/svg/gnome-canvas-bpath-util.cpp
index b583e1a66..057e54ec2 100644
--- a/src/svg/gnome-canvas-bpath-util.cpp
+++ b/src/svg/gnome-canvas-bpath-util.cpp
@@ -10,6 +10,10 @@
  *          Raph Levien <raph@acm.org>
  */
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 
diff --git a/src/svg/itos.cpp b/src/svg/itos.cpp
index ee49f5014..0f2c64ec4 100644
--- a/src/svg/itos.cpp
+++ b/src/svg/itos.cpp
@@ -16,6 +16,7 @@
 // Standard include files
 #include <algorithm>
 #include <string>		// for string
+#include <cstring>
 
 using namespace std;
 
diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index 79b266b42..769834d18 100644
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,5 +1,10 @@
-#include "svg/strip-trailing-zeros.h"
+
+#include <cstring>
+#include <string>
 #include <glib/gmessages.h>
+
+#include "svg/strip-trailing-zeros.h"
+
 using std::string;
 
 string
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 71ee5dcb5..98a6cbf3b 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -17,6 +17,10 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gstrfuncs.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index fe79736dc..e1f87fdb9 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -17,9 +17,10 @@
 # include "config.h"
 #endif
 
-#include "prefs-utils.h"
-#include "svg-color.h"
-#include "svg-icc-color.h"
+#include <cstdlib>
+#include <cstdio> // sprintf
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
@@ -28,9 +29,13 @@
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>
 #include <glib/gutils.h>
-#include <cstdio> // sprintf
 #include <errno.h>
+
 #include "strneq.h"
+#include "prefs-utils.h"
+#include "svg-color.h"
+#include "svg-icc-color.h"
+
 using std::sprintf;
 
 struct SPSVGColor {
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 3b13e3d89..f0b7f85f6 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -16,8 +16,11 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <math.h>
 #include <glib/gstrfuncs.h>
+
 #include "svg.h"
 #include "stringstream.h"
 #include "../unit-constants.h"
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index b491e61c0..0239d2ae0 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -26,6 +26,8 @@
      Lauris Kaplinski <lauris@ximian.com>
 */
 
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
diff --git a/src/svg/svg.h b/src/svg/svg.h
index 1881fb4a0..4adacef7a 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -12,10 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib/gtypes.h>
-#include "svg/svg-length.h"
 #include <vector>
+#include <cstring>
 #include <string>
 
+#include "svg/svg-length.h"
+
 struct NArtBpath;
 struct NRMatrix;
 namespace NR {