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

Fix preprocessor boolean ops for MSVC

Browse Source
This commit is contained in:
James Turner 2013-06-19 09:04:15 +01:00
parent 4d26e144ab
commit aea2dab0d7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/scene/tsync/terrasync.cxx
View File

@ -87,7 +87,7 @@
}; };
#endif #endif
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
static const bool svn_built_in_available = true; static const bool svn_built_in_available = true;
#else #else
static const bool svn_built_in_available = false; static const bool svn_built_in_available = false;
@ -171,7 +171,7 @@ public:
void setUseSvn(bool use_svn) { _use_svn = use_svn;} void setUseSvn(bool use_svn) { _use_svn = use_svn;}
void setAllowedErrorCount(int errors) {_allowed_errors = errors;} void setAllowedErrorCount(int errors) {_allowed_errors = errors;}
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
void setUseBuiltin(bool built_in) { _use_built_in = built_in;} void setUseBuiltin(bool built_in) { _use_built_in = built_in;}
#endif #endif
@ -238,7 +238,7 @@ SGTerraSync::SvnThread::SvnThread() :
_success_count(0), _success_count(0),
_consecutive_errors(0), _consecutive_errors(0),
_allowed_errors(6), _allowed_errors(6),
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
_use_built_in(true), _use_built_in(true),
#endif #endif
_is_dirty(false), _is_dirty(false),
@ -307,7 +307,7 @@ bool SGTerraSync::SvnThread::start()
return false; return false;
} }
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
_use_svn |= _use_built_in; _use_svn |= _use_built_in;
#endif #endif
@ -337,7 +337,7 @@ bool SGTerraSync::SvnThread::start()
_running = true; _running = true;
string status; string status;
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
if (_use_svn && _use_built_in) if (_use_svn && _use_built_in)
status = "Using built-in SVN support. "; status = "Using built-in SVN support. ";
else else
@ -383,7 +383,7 @@ bool SGTerraSync::SvnThread::syncTree(const char* dir, bool& isNewDirectory)
} }
} }
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
if (_use_built_in) if (_use_built_in)
return syncTreeInternal(dir); return syncTreeInternal(dir);
else else
@ -772,7 +772,7 @@ void SGTerraSync::reinit()
_svnThread->setLocalDir(_terraRoot->getStringValue("scenery-dir","")); _svnThread->setLocalDir(_terraRoot->getStringValue("scenery-dir",""));
_svnThread->setAllowedErrorCount(_terraRoot->getIntValue("max-errors",5)); _svnThread->setAllowedErrorCount(_terraRoot->getIntValue("max-errors",5));
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) #if defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT)
_svnThread->setUseBuiltin(_terraRoot->getBoolValue("use-built-in-svn",true)); _svnThread->setUseBuiltin(_terraRoot->getBoolValue("use-built-in-svn",true));
#else #else
_terraRoot->setBoolValue("use-built-in-svn",false); _terraRoot->setBoolValue("use-built-in-svn",false);