From 4c3a13c3a11820c85ee37be5b62abf8597a49f11 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 5 Aug 2007 14:51:56 +0000
Subject: [PATCH] From Andy Skinner, fixes for avoiding warnings about mixing c
 and c++ versions of c libs.

---
 src/osg/CullSettings.cpp              | 2 ++
 src/osg/Referenced.cpp                | 2 ++
 src/osgGA/DriveManipulator.cpp        | 2 ++
 src/osgPlugins/txp/TXPParser.cpp      | 2 ++
 src/osgUtil/Optimizer.cpp             | 3 +++
 src/osgUtil/RenderBin.cpp             | 3 +++
 src/osgViewer/ViewerEventHandlers.cpp | 2 ++
 7 files changed, 16 insertions(+)

diff --git a/src/osg/CullSettings.cpp b/src/osg/CullSettings.cpp
index b2ada8817..3d9d79119 100644
--- a/src/osg/CullSettings.cpp
+++ b/src/osg/CullSettings.cpp
@@ -10,6 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
+#include <stdlib.h>
+#include <string.h>
 
 #include <osg/CullSettings>
 #include <osg/ArgumentParser>
diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp
index 415721465..075142f16 100644
--- a/src/osg/Referenced.cpp
+++ b/src/osg/Referenced.cpp
@@ -10,6 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
+#include <stdlib.h>
+
 #include <osg/Referenced>
 #include <osg/Notify>
 #include <osg/ApplicationUsage>
diff --git a/src/osgGA/DriveManipulator.cpp b/src/osgGA/DriveManipulator.cpp
index 79ef226aa..f25b5f4f2 100644
--- a/src/osgGA/DriveManipulator.cpp
+++ b/src/osgGA/DriveManipulator.cpp
@@ -15,6 +15,8 @@
     #pragma warning( disable : 4786 )
 #endif
 
+#include <stdlib.h>
+
 #include <osgGA/DriveManipulator>
 #include <osgUtil/IntersectVisitor>
 #include <osg/Notify>
diff --git a/src/osgPlugins/txp/TXPParser.cpp b/src/osgPlugins/txp/TXPParser.cpp
index 77d633128..1e58b3509 100644
--- a/src/osgPlugins/txp/TXPParser.cpp
+++ b/src/osgPlugins/txp/TXPParser.cpp
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+
 #include <osg/AlphaFunc>
 #include <osg/Group>
 #include <osg/Material>
diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp
index 2a3b7e384..5a3bc6643 100644
--- a/src/osgUtil/Optimizer.cpp
+++ b/src/osgUtil/Optimizer.cpp
@@ -10,6 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
+#include <stdlib.h>
+#include <string.h>
+
 #include <osgUtil/Optimizer>
 
 #include <osg/ApplicationUsage>
diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp
index 23ab70c88..7a52a0f24 100644
--- a/src/osgUtil/RenderBin.cpp
+++ b/src/osgUtil/RenderBin.cpp
@@ -10,6 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
+#include <stdlib.h>
+#include <string.h>
+
 #include <osgUtil/RenderBin>
 #include <osgUtil/RenderStage>
 #include <osgUtil/Statistics>
diff --git a/src/osgViewer/ViewerEventHandlers.cpp b/src/osgViewer/ViewerEventHandlers.cpp
index 85a88a938..b85ce5f6c 100644
--- a/src/osgViewer/ViewerEventHandlers.cpp
+++ b/src/osgViewer/ViewerEventHandlers.cpp
@@ -11,6 +11,8 @@
 * OpenSceneGraph Public License for more details.
 */
 
+#include <stdlib.h>
+
 #include <fstream>
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>