Changeset 9757

Show
Ignore:
Timestamp:
02/10/09 21:31:50 (6 years ago)
Author:
robert
Message:

Merged warning fix from OSG-2.8 branch:

svn merge -r 9755:9756 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeLists.txt

    r9741 r9757  
    3434# set to 0 when not a release candidate, non zero means that any generated  
    3535# svn tags will be treated as release candidates of given number 
    36 SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1) 
     36SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0) 
    3737 
    3838SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) 
  • OpenSceneGraph/trunk/src/osgPlugins/cfg/ConfigParser.cpp

    r9393 r9757  
    22622262            else 
    22632263            */ 
    2264             execlp( cpp_path, "cpp",  "-P", fileName.c_str(), NULL ); 
     2264            execlp( cpp_path, "cpp",  "-P", fileName.c_str(), (char *)NULL ); 
    22652265 
    22662266            // This should not execute unless an error happens