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

Merge a tweak from Tat to keep Mac 10.5 from crashing on realpath

Browse Source
This commit is contained in:
James Turner
2012-05-30 11:08:11 +01:00
parent 950af5375c
commit edbea633f3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/misc/sg_path.cxx
+4 -1
View File
@@ -485,8 +485,11 @@ bool SGPath::rename(const SGPath& newName)
std::string SGPath::realpath() const std::string SGPath::realpath() const
{ {
#ifdef _WIN32 #if defined(_WIN32) || (defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= 1050)
// Not implemented for Windows yet. Return original path instead. // Not implemented for Windows yet. Return original path instead.
// Workaround for Mac OS 10.5. Somehow fgfs crashes on Mac at ::realpath.
// simply returning path works on Mac since absolute path is passed from the GUI launcher
return path; return path;
#else #else
char* buf = ::realpath(path.c_str(), NULL); char* buf = ::realpath(path.c_str(), NULL);