oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

*: use WIN32 instead of G_OS_WIN32

Browse Source
This commit is contained in:
Max Kellermann
2013-10-15 08:33:44 +02:00
parent 9508ea982b
commit e4e80ff0cb
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CommandLine.cxx
View File

@@ -54,7 +54,7 @@
#ifdef WIN32
#define CONFIG_FILE_LOCATION "\\mpd\\mpd.conf"
#else /* G_OS_WIN32 */
#else
#define USER_CONFIG_FILE_LOCATION1 ".mpdconf"
#define USER_CONFIG_FILE_LOCATION2 ".mpd/mpd.conf"
#define USER_CONFIG_FILE_LOCATION_XDG "mpd/mpd.conf"
@@ -219,7 +219,7 @@ parse_cmdline(int argc, char **argv, struct options *options,
if (!path.IsNull() && FileExists(path))
return ReadConfigFile(path, error);
}
#else /* G_OS_WIN32 */
#else
Path path = PathBuildChecked(Path::FromUTF8(g_get_user_config_dir()),
USER_CONFIG_FILE_LOCATION_XDG);
if (!path.IsNull() && FileExists(path))