From 831dc38166926bab32d7e31b15e24ff632ae6830 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 13 Dec 2007 15:24:42 +0000
Subject: [PATCH] From Andy Skinner, build fixes for Solaris

---
 src/osgPlugins/cfg/CameraConfig.cpp | 6 ++++--
 src/osgPlugins/cfg/ConfigParser.cpp | 1 +
 src/osgPlugins/shp/XBaseParser.cpp  | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/cfg/CameraConfig.cpp b/src/osgPlugins/cfg/CameraConfig.cpp
index 8995c3b90..15379547c 100644
--- a/src/osgPlugins/cfg/CameraConfig.cpp
+++ b/src/osgPlugins/cfg/CameraConfig.cpp
@@ -27,6 +27,8 @@
 #  include <X11/Xlib.h>
 #endif
 
+#include <memory.h>
+#include <stdlib.h>
 #include <iostream>
 #include <cmath>
 #include "CameraConfig.h"
@@ -65,8 +67,8 @@ CameraConfig::CameraConfig() :
     _offset_matrix[4] = 0.0; _offset_matrix[5] = 1.0; _offset_matrix[6] = 0.0; _offset_matrix[7] = 0.0;
     _offset_matrix[8] = 0.0; _offset_matrix[9] = 0.0; _offset_matrix[10] = 1.0; _offset_matrix[11] = 0.0;
     _offset_matrix[12] = 0.0; _offset_matrix[13] = 0.0; _offset_matrix[14] = 0.0; _offset_matrix[15] = 1.0;
-	
-	_threadModelDirective = CameraGroup::getDefaultThreadModel();
+    
+    _threadModelDirective = CameraGroup::getDefaultThreadModel();
 
 }
 
diff --git a/src/osgPlugins/cfg/ConfigParser.cpp b/src/osgPlugins/cfg/ConfigParser.cpp
index de2cf5804..2119e7f6b 100644
--- a/src/osgPlugins/cfg/ConfigParser.cpp
+++ b/src/osgPlugins/cfg/ConfigParser.cpp
@@ -221,6 +221,7 @@
 #define SUPPORT_CPP 1
 #endif
 
+#include <string.h>
 #include <stdio.h>
 #include <fstream>
 #include <string>
diff --git a/src/osgPlugins/shp/XBaseParser.cpp b/src/osgPlugins/shp/XBaseParser.cpp
index 97e087bea..0437f79bb 100644
--- a/src/osgPlugins/shp/XBaseParser.cpp
+++ b/src/osgPlugins/shp/XBaseParser.cpp
@@ -3,8 +3,10 @@
 #include <vector>
 #include <string>
 
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
 #if defined(_MSC_VER) || defined(__MINGW32__)
-    #include <stdio.h>
     #include <io.h>
 #else
     #include <unistd.h>