File OpenSceneGraph-1.2-abuild.patch of Package OpenSceneGraph1

Index: OpenSceneGraph-1.2/OpenSceneGraph/examples/osgdepthpartition/DistanceAccumulator.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/examples/osgdepthpartition/DistanceAccumulator.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/examples/osgdepthpartition/DistanceAccumulator.cpp
@@ -3,7 +3,8 @@
 #include <osg/Transform>
 #include <osg/Projection>
 #include <algorithm>
-#include <math.h>
+#include <cmath>
+#include <climits>
 
 /** Function that sees whether one DistancePair should come before another in
     an sorted list. Used to sort the vector of DistancePairs. */
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ApplicationUsage.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/ApplicationUsage.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ApplicationUsage.cpp
@@ -1,5 +1,6 @@
 #include <osg/ApplicationUsage>
 #include <osg/Math>
+#include <cstdlib>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ArgumentParser.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/ArgumentParser.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ArgumentParser.cpp
@@ -5,6 +5,9 @@
 #include <set>
 #include <iostream>
 
+#include <cstdlib>
+#include <cstring>
+
 using namespace osg;
 
 bool ArgumentParser::isOption(const char* str)
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendColor.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/BlendColor.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendColor.cpp
@@ -15,6 +15,7 @@
 #include <osg/State>
 #include <osg/Notify>
 #include <osg/buffered_value>
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendEquation.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/BlendEquation.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendEquation.cpp
@@ -15,7 +15,7 @@
 #include <osg/State>
 #include <osg/Notify>
 #include <osg/buffered_value>
-
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendFunc.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/BlendFunc.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BlendFunc.cpp
@@ -14,6 +14,7 @@
 #include <osg/GLExtensions>
 #include <osg/State>
 #include <osg/Notify>
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BufferObject.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/BufferObject.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/BufferObject.cpp
@@ -10,8 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
+#include <cstring>
 #include <float.h>
 
 #include <osg/BufferObject>
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ClampColor.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/ClampColor.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/ClampColor.cpp
@@ -15,7 +15,7 @@
 #include <osg/State>
 #include <osg/Notify>
 #include <osg/buffered_value>
-
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/CullSettings.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/CullSettings.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/CullSettings.cpp
@@ -17,6 +17,9 @@
 
 #include <osg/Notify>
 
+#include <cstdlib>
+#include <cstring>
+
 using namespace osg;
 
 CullSettings::CullSettings(const CullSettings& cs)
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/DisplaySettings.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/DisplaySettings.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/DisplaySettings.cpp
@@ -17,6 +17,7 @@
 #include <osg/ref_ptr>
 
 #include <algorithm>
+#include <cstring>
 
 using namespace osg;
 using namespace std;
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Geometry.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Geometry.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Geometry.cpp
@@ -12,6 +12,7 @@
 */
 #include <osg/Geometry>
 #include <osg/Notify>
+#include <cstdlib>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Image.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Image.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Image.cpp
@@ -24,6 +24,9 @@
 
 #include "dxtctool.h"
 
+#include <cstring>
+#include <cstdlib>
+
 using namespace osg;
 using namespace std;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Notify.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Notify.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Notify.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <iostream>
 #include <fstream>
+#include <cstdlib>
 
 using namespace std;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Point.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Point.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Point.cpp
@@ -17,6 +17,8 @@
 #include <osg/Point>
 #include <osg/Notify>
 
+#include <cstring>
+
 using namespace osg;
 
 // ARB, EXT and SGIS versions use same values as OpenGL version 1.4.
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/PolygonOffset.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/PolygonOffset.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/PolygonOffset.cpp
@@ -13,6 +13,7 @@
 #include <osg/GL>
 #include <osg/PolygonOffset>
 #include <osg/Notify>
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Program.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Program.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Program.cpp
@@ -18,6 +18,7 @@
 
 #include <fstream>
 #include <list>
+#include <cstdlib>
 
 #include <osg/Notify>
 #include <osg/State>
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Referenced.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Referenced.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Referenced.cpp
@@ -18,6 +18,7 @@
 #include <typeinfo>
 #include <memory>
 #include <set>
+#include <cstdlib>
 
 #include <OpenThreads/ScopedLock>
 #include <OpenThreads/Mutex>
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/TexEnvFilter.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/TexEnvFilter.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/TexEnvFilter.cpp
@@ -13,6 +13,7 @@
 #include <osg/GLExtensions>
 #include <osg/TexEnvFilter>
 #include <osg/State>
+#include <cstdlib>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Texture.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Texture.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Texture.cpp
@@ -22,6 +22,9 @@
 #include <OpenThreads/ScopedLock>
 #include <OpenThreads/Mutex>
 
+#include <cstring>
+#include <cstdlib>
+
 using namespace osg;
 
 #ifndef GL_TEXTURE_WRAP_R
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/TextureCubeMap.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/TextureCubeMap.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/TextureCubeMap.cpp
@@ -19,6 +19,7 @@
 
 #include <osg/GLU>
 
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Uniform.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osg/Uniform.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osg/Uniform.cpp
@@ -20,6 +20,7 @@
 #include <osg/StateSet>
 
 #include <algorithm>
+#include <cstring>
 
 using namespace osg;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/Field.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgDB/Field.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/Field.cpp
@@ -11,6 +11,7 @@
  * OpenSceneGraph Public License for more details.
 */
 #include <osgDB/Field>
+#include <cstring>
 
 using namespace osgDB;
 using namespace std;
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/FieldReader.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgDB/FieldReader.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/FieldReader.cpp
@@ -12,6 +12,7 @@
 */
 #include <osgDB/Field>
 #include <osgDB/FieldReader>
+#include <cstdio>
 
 using namespace osgDB;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/FileNameUtils.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgDB/FileNameUtils.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgDB/FileNameUtils.cpp
@@ -12,6 +12,7 @@
 */
 #include <osgDB/FileNameUtils>
 
+/*
 #if defined(__sgi)
     #include <ctype.h>
 #elif defined(__GNUC__) || !defined(WIN32) || defined(__MWERKS__)
@@ -19,6 +20,10 @@
     using std::tolower;
     using std::strlen;    
 #endif
+*/
+
+#include <string>
+#include <cstring>
 
 using namespace std;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/ac3d/Geode.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/ac3d/Geode.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/ac3d/Geode.cpp
@@ -6,7 +6,7 @@
  * upgraded to different types of Geometry primitive by Geoff Michel.
  * Old GeoSet parsing code is commented out - will be removed eventually.
  */
-#include <assert.h>
+#include <cassert>
 #include <list>
 #include <osg/Material>
 #include <osg/Texture2D>
@@ -14,6 +14,7 @@
 #include <osg/Geometry>
 #include <limits>
 #include <iomanip>
+#include <iostream>
 
 #include "Exception.h"
 #include "Geode.h"
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/directx.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/directx/directx.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/directx.cpp
@@ -31,7 +31,8 @@
 #include <iostream>
 #include <sstream>
 
-#include <math.h>
+#include <cmath>
+#include <cstring>
 
 #include <osg/Notify>
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/mesh.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/directx/mesh.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/mesh.cpp
@@ -29,6 +29,8 @@
 #include "directx.h"
 
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 #include <osg/Notify>
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/types.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/directx/types.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/directx/types.cpp
@@ -29,6 +29,7 @@
 #include "types.h"
 
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/flt/HeaderRecord.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/flt/HeaderRecord.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/flt/HeaderRecord.cpp
@@ -1,5 +1,7 @@
 // HeaderRecord.cpp
 
+#include <cstring>
+
 #include "osg/Group"
 
 #include "flt.h"
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/lwo/ReaderWriterLWO.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/lwo/ReaderWriterLWO.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/lwo/ReaderWriterLWO.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <sstream>
 #include <algorithm>
+#include <memory>
 
 #include <osg/Notify>
 #include <osg/Node>
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/OpenFlight/DataInputStream.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/OpenFlight/DataInputStream.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/OpenFlight/DataInputStream.cpp
@@ -9,6 +9,8 @@
 #include <osg/Endian>
 #include <osg/Notify>
 
+#include <cstring>
+
 using namespace flt;
 
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_swap.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/txp/trpage_swap.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_swap.cpp
@@ -13,8 +13,9 @@
    ************************
    */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 /* trpage_swap.h
 	Byte swapping utility functions.
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/TXPParser.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/txp/TXPParser.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/TXPParser.cpp
@@ -23,6 +23,8 @@
 #include "TXPParser.h"
 #include "TXPArchive.h"
 
+#include <cstdlib>
+
 using namespace txp;
 
 #include <sstream>
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgSim/OpenFlightOptimizer.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgSim/OpenFlightOptimizer.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgSim/OpenFlightOptimizer.cpp
@@ -14,6 +14,7 @@
 
 #include <vector>
 #include <map>
+#include <cstdlib>
 
 using namespace osgFlightUtil;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgText/DefaultFont.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgText/DefaultFont.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgText/DefaultFont.cpp
@@ -18,6 +18,8 @@
 
 #include <osg/Notify>
 
+#include <cstdlib>
+
 using namespace osgText;
 
 DefaultFont::DefaultFont()
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/DisplayRequirementsVisitor.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgUtil/DisplayRequirementsVisitor.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/DisplayRequirementsVisitor.cpp
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <list>
 #include <set>
+#include <cstring>
 
 #include <osgUtil/DisplayRequirementsVisitor>
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/Optimizer.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgUtil/Optimizer.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/Optimizer.cpp
@@ -39,6 +39,7 @@
 #include <algorithm>
 #include <numeric>
 #include <sstream>
+#include <cstring>
 
 using namespace osgUtil;
 
Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/RenderBin.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgUtil/RenderBin.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgUtil/RenderBin.cpp
@@ -19,6 +19,7 @@
 #include <osg/AlphaFunc>
 
 #include <algorithm>
+#include <cstring>
 
 using namespace osg;
 using namespace osgUtil;
Index: OpenSceneGraph-1.2/Producer/include/Producer/Camera
===================================================================
--- OpenSceneGraph-1.2.orig/Producer/include/Producer/Camera
+++ OpenSceneGraph-1.2/Producer/include/Producer/Camera
@@ -18,6 +18,7 @@
 #include <Producer/Referenced>
 
 #include <vector>
+#include <cstring>
 
 #include <Producer/RefOpenThreads>
 
Index: OpenSceneGraph-1.2/Producer/src/KeyboardMouse.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/Producer/src/KeyboardMouse.cpp
+++ OpenSceneGraph-1.2/Producer/src/KeyboardMouse.cpp
@@ -33,11 +33,12 @@
 #endif
 
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include <vector>
 #include <map>
 #include <algorithm>
 
+#include <cstring>
 #include <float.h>
 
 #define TIMER_ID        555
Index: OpenSceneGraph-1.2/Producer/src/RenderSurface.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/Producer/src/RenderSurface.cpp
+++ OpenSceneGraph-1.2/Producer/src/RenderSurface.cpp
@@ -12,6 +12,8 @@
  */
 
 #include <Producer/RenderSurface>
+#include <cstdlib>
+#include <cstring>
 
 using namespace std;
 using namespace Producer;
Index: OpenSceneGraph-1.2/Producer/src/Version.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/Producer/src/Version.cpp
+++ OpenSceneGraph-1.2/Producer/src/Version.cpp
@@ -12,6 +12,7 @@
  */
 
 #include <string>
+#include <cstdlib>
 #include <Producer/Version>
 
 using namespace Producer;