diff --git a/CMakeLists.txt b/CMakeLists.txt index f8b64ea25..a2f2fac75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/src/osgPlugins/cfg/ConfigParser.cpp b/src/osgPlugins/cfg/ConfigParser.cpp index e4c8a92ee..001e08246 100644 --- a/src/osgPlugins/cfg/ConfigParser.cpp +++ b/src/osgPlugins/cfg/ConfigParser.cpp @@ -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" );