diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-04 23:48:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-04 23:48:01 +0200 |
| commit | 85b77b81caa40f8bcd03921380246cb5863d5d21 (patch) | |
| tree | cf4bc60a6760c52bcbd642a253b45f3bc5ad8775 /src/CommandLine.cxx | |
| parent | 5bf2ec5a74bb1247a8cc84e90577eecbee116c62 (diff) | |
| download | mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.tar.gz mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.tar.xz mpd-85b77b81caa40f8bcd03921380246cb5863d5d21.zip | |
*: use gcc.h macros instead of GLib
Diffstat (limited to 'src/CommandLine.cxx')
| -rw-r--r-- | src/CommandLine.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 1e0e028ec..a62ea370e 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -49,7 +49,7 @@ #include <stdio.h> #include <stdlib.h> -#ifdef G_OS_WIN32 +#ifdef WIN32 #define CONFIG_FILE_LOCATION "\\mpd\\mpd.conf" #else /* G_OS_WIN32 */ #define USER_CONFIG_FILE_LOCATION1 ".mpdconf" @@ -62,7 +62,7 @@ cmdline_quark(void) return g_quark_from_static_string("cmdline"); } -G_GNUC_NORETURN +gcc_noreturn static void version(void) { puts(PACKAGE " (MPD: Music Player Daemon) " VERSION " \n" @@ -203,7 +203,7 @@ parse_cmdline(int argc, char **argv, struct options *options, } else if (argc <= 1) { /* default configuration file path */ -#ifdef G_OS_WIN32 +#ifdef WIN32 Path path = PathBuildChecked(Path::FromUTF8(g_get_user_config_dir()), CONFIG_FILE_LOCATION); if (!path.IsNull() && FileExists(path)) |