From 06d8aaba21496e6a39a7c18dd82e0d3efbeb531c Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu, 31 Jan 2008 19:06:59 +0000
Subject: Applying fixes for gcc 4.3 build issues (closes LP: #169115)

(bzr r4629)
---
 src/libavoid/connector.cpp  | 4 ++--
 src/libavoid/makepath.cpp   | 1 +
 src/libavoid/router.cpp     | 5 +++--
 src/libavoid/visibility.cpp | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/libavoid')

diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index 3526b3f15..647303371 100644
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/graph.h"
 #include "libavoid/connector.h"
 #include "libavoid/makepath.h"
@@ -30,7 +31,6 @@
 
 namespace Avoid {
 
-    
 ConnRef::ConnRef(Router *router, const unsigned int id)
     : _router(router)
     , _id(id)
diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp
index 9a4f7beaa..56d3a257e 100644
--- a/src/libavoid/makepath.cpp
+++ b/src/libavoid/makepath.cpp
@@ -33,6 +33,7 @@
 #include "libavoid/router.h"
 #include <algorithm>
 #include <vector>
+#include <climits>
 #include <limits.h>
 #include <math.h>
 
diff --git a/src/libavoid/router.cpp b/src/libavoid/router.cpp
index 4b1652ca0..df0bacd02 100644
--- a/src/libavoid/router.cpp
+++ b/src/libavoid/router.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/shape.h"
 #include "libavoid/router.h"
 #include "libavoid/visibility.h"
@@ -636,7 +637,7 @@ void Router::markConnectors(ShapeRef *shape)
                 if (((int) r_p2.y) != 0)
                 {
                     printf("r_p2.y: %f != 0\n", r_p2.y);
-                    abort();
+                    std::abort();
                 }
                 // This might be slightly off.
                 r_p2.y = 0;
diff --git a/src/libavoid/visibility.cpp b/src/libavoid/visibility.cpp
index 58df94d92..d2b057643 100644
--- a/src/libavoid/visibility.cpp
+++ b/src/libavoid/visibility.cpp
@@ -20,7 +20,6 @@
  *
 */
 
-
 #include <algorithm>
 #include <cfloat>
 
-- 
cgit v1.2.3