FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged warning fix from OSG-2.8 branch:

Browse Source 
svn merge -r 9755:9756 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8
This commit is contained in:
Robert Osfield 2009-02-10 20:31:50 +00:00
parent 92b4e6ea54
commit 81043b1028
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,7 +33,7 @@ SET(OPENSCENEGRAPH_SOVERSION 55)
# set to 0 when not a release candidate, non zero means that any generated
# svn tags will be treated as release candidates of given number
SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1)
SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})

2
src/osgPlugins/cfg/ConfigParser.cpp
View File

@ -2261,7 +2261,7 @@ bool CameraConfig::parseFile( const std::string &file )
execlp( cpp_path, "cpp", "-P", 0L );
else
*/
execlp( cpp_path, "cpp", "-P", fileName.c_str(), NULL );
execlp( cpp_path, "cpp", "-P", fileName.c_str(), (char *)NULL );
// This should not execute unless an error happens
perror( "execlp" );