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

(bzr r4629)

11 files changed, 25 insertions, 8 deletions

diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index bb68ba9c4..979462cef 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <cstring>
+
 #include "algorithms/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
index 0464e4fb7..a40ddd661 100644
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,10 @@
+
+#include <cstring>
+#include <string>
+#include <glib/gstrfuncs.h>
+
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
-#include <glib/gstrfuncs.h>
 
 static char const *
 local_part(char const *const qname)
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 4d346e009..cb4161141 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -3,6 +3,8 @@
 #endif
 
 #include <map>
+#include <cstring>
+#include <string>
 #include <glib.h> // g_assert()
 
 #include "xml/node-iterators.h"
diff --git a/src/xml/quote-test.cpp b/src/xml/quote-test.cpp
index 61291b9de..197ca5309 100644
--- a/src/xml/quote-test.cpp
+++ b/src/xml/quote-test.cpp
@@ -1,7 +1,9 @@
 /* Initial author: Peter Moulder.
    Hereby released into the Public Domain. */
 
+#include <cstring>
 #include <functional>
+
 #include "utest/test-1ary-cases.h"
 
 /* mental disclaims all responsibility for this evil idea for testing
diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index b5505c5e1..37f00bad0 100644
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -11,7 +11,7 @@
  * of the GNU General Public License: see the file `COPYING'.
  */
 
-#include <string.h>
+#include <cstring>
 #include <glib/gmem.h>
 
 
diff --git a/src/xml/repr-action-test.cpp b/src/xml/repr-action-test.cpp
index 0e3d8d4a4..7e022eb18 100644
--- a/src/xml/repr-action-test.cpp
+++ b/src/xml/repr-action-test.cpp
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>
 #include "../utest/utest.h"
 
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index ec5848366..0a2e215a0 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -1,10 +1,10 @@
 /*
  *   bulia byak <buliabyak@users.sf.net>
-*/ 
- 
-#define SP_REPR_CSS_C
+*/
 
+#define SP_REPR_CSS_C
 
+#include <cstring>
 #include <glibmm/ustring.h>
 
 #include "xml/repr.h"
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 62d43dd41..8f149a130 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -16,6 +16,8 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
 #include <stdexcept>
 
 #include "xml/repr.h"
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 7a45f6fcd..97676bebe 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -20,11 +20,11 @@
 #include <math.h>
 
 #if HAVE_STRING_H
-# include <string.h>
+# include <cstring>
 #endif
 
 #if HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif
 
 
diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index be226a357..4494d3fe6 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -22,6 +22,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+
 #include "xml/repr.h"
 #include "xml/text-node.h"
 #include "xml/element-node.h"
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index d38e14b3f..084547a59 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -15,7 +15,10 @@
  *
  */
 
+#include <cstring>
+#include <string>
 #include <glib/gstrfuncs.h>
+
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"