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

(bzr r4629)

3 files changed, 8 insertions, 3 deletions

diff --git a/src/libnr/n-art-bpath.h b/src/libnr/n-art-bpath.h
index 0f0f690fc..fdb9855be 100644
--- a/src/libnr/n-art-bpath.h
+++ b/src/libnr/n-art-bpath.h
@@ -9,6 +9,7 @@
 
 #include "libnr/nr-point.h"
 #include "libnr/nr-path-code.h"
+#include <cstdlib>
 
 /**
  * Old-style path segment.
@@ -31,7 +32,7 @@ public:
             case 1: return NR::Point(x1, y1);
             case 2: return NR::Point(x2, y2);
             case 3: return NR::Point(x3, y3);
-            default: abort();
+            default: std::abort();
         }
     }
 
@@ -43,7 +44,7 @@ public:
             case 1: x1 = p[X]; y1 = p[Y]; break;
             case 2: x2 = p[X]; y2 = p[Y]; break;
             case 3: x3 = p[X]; y3 = p[Y]; break;
-            default: abort();
+            default: std::abort();
         }
     }
 };
diff --git a/src/libnr/nr-matrix.cpp b/src/libnr/nr-matrix.cpp
index 12a2f2fcb..db01b966e 100644
--- a/src/libnr/nr-matrix.cpp
+++ b/src/libnr/nr-matrix.cpp
@@ -11,6 +11,7 @@
  * This code is in public domain
  */
 
+#include <cstdlib>
 #include "nr-matrix.h"
 
 
@@ -605,7 +606,7 @@ void assert_close(Matrix const &a, Matrix const &b)
                 a[0], a[1], b[0], b[1],
                 a[2], a[3], b[2], b[3],
                 a[4], a[5], b[4], b[5]);
-        abort();
+        std::abort();
     }
 }
 
diff --git a/src/libnr/nr-pixblock.cpp b/src/libnr/nr-pixblock.cpp
index 2f103d7d1..8d2e930ef 100644
--- a/src/libnr/nr-pixblock.cpp
+++ b/src/libnr/nr-pixblock.cpp
@@ -9,6 +9,9 @@
  * This code is in the Public Domain
  */
 
+#include <cstring>
+#include <string>
+#include <string.h>
 #include <glib/gmem.h>
 #include "nr-pixblock.h"