From 85b77b81caa40f8bcd03921380246cb5863d5d21 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 4 Aug 2013 23:48:01 +0200
Subject: *: use gcc.h macros instead of GLib

---
 src/CommandLine.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/CommandLine.cxx')

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))
-- 
cgit v1.2.3