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

Merge pull request #998 from jpabst0/fix_delimiter_compilation

Browse Source 
fix variable name "delimiter"/compilation for win32
This commit is contained in:
Robert Osfield 2020-11-17 08:35:51 +00:00 committed by GitHub
commit 40bddd8d95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/DisplaySettings.cpp
View File

@ -734,7 +734,7 @@ void DisplaySettings::readEnvironmentalVariables()
if (getEnvVar("OSG_KEYSTONE_FILES", value)) if (getEnvVar("OSG_KEYSTONE_FILES", value))
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
char delimitor = ';'; char delimiter = ';';
#else #else
char delimiter = ':'; char delimiter = ':';
#endif #endif
@ -798,7 +798,7 @@ void DisplaySettings::readEnvironmentalVariables()
if (getEnvVar("OSG_SHADER_PIPELINE_FILES", value)) if (getEnvVar("OSG_SHADER_PIPELINE_FILES", value))
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
char delimitor = ';'; char delimiter = ';';
#else #else
char delimiter = ':'; char delimiter = ':';
#endif #endif

2
src/osgDB/FileUtils.cpp
View File

@ -275,7 +275,7 @@ bool osgDB::setCurrentWorkingDirectory( const std::string &newCurrentWorkingDire
void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath) void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath)
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
char delimitor = ';'; char delimiter = ';';
#else #else
char delimiter = ':'; char delimiter = ':';
#endif #endif