From 09b5dfbd5391429d2eb217855125b06b2226f32f Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 22 Jul 2010 07:55:35 +0000 Subject: Prevent Python from stripping off the final newline of the main(){} autoconfiguration tests. Some versions of gcc care enough about ANSI C to complain about this. Use the Linux install hierarchy conventions on other Unices as well. XKeysymToString returns NULL on unknown keysyms, which is not a valid std::string initializer. There appears to be some disagreement regarding the second parameter to iconv(). Some versions/installations have it as const, others don't. Unfortunately, due to wonderful C++ brain damage, implicit conversion from const to non-const doesn't work here. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5945 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/FileUtil.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/Common/Src/FileUtil.cpp') diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index e7736f2d5b..1080ae3f08 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -652,13 +652,11 @@ const char *GetUserPath(int DirIDX) #ifdef _WIN32 // Keep the directory setup the way it was on windows snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); -#elif defined (__linux__) +#else if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); else snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); -#else - snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); #endif INFO_LOG(COMMON, "GetUserPath: Setting user directory to %s:", UserDir); -- cgit v1.2.3