diff options
| -rw-r--r-- | src/ClientWrite.cxx | 2 | ||||
| -rw-r--r-- | src/CommandLine.cxx | 4 | ||||
| -rw-r--r-- | src/TimePrint.cxx | 4 | ||||
| -rw-r--r-- | src/UpdateWalk.cxx | 4 | ||||
| -rw-r--r-- | src/fs/Path.cxx | 6 | ||||
| -rw-r--r-- | src/system/Resolver.cxx | 6 | ||||
| -rw-r--r-- | src/system/SocketUtil.cxx | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/ClientWrite.cxx b/src/ClientWrite.cxx index dc18faafd..ebed5f570 100644 --- a/src/ClientWrite.cxx +++ b/src/ClientWrite.cxx @@ -47,7 +47,7 @@ client_puts(Client *client, const char *s) void client_vprintf(Client *client, const char *fmt, va_list args) { -#ifndef G_OS_WIN32 +#ifndef WIN32 va_list tmp; int length; diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 85c929420..22f0ccc02 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -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)) diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx index c5247dd9d..a0b07c447 100644 --- a/src/TimePrint.cxx +++ b/src/TimePrint.cxx @@ -26,7 +26,7 @@ void time_print(Client *client, const char *name, time_t t) { -#ifdef G_OS_WIN32 +#ifdef WIN32 const struct tm *tm2 = gmtime(&t); #else struct tm tm; @@ -37,7 +37,7 @@ time_print(Client *client, const char *name, time_t t) char buffer[32]; strftime(buffer, sizeof(buffer), -#ifdef G_OS_WIN32 +#ifdef WIN32 "%Y-%m-%dT%H:%M:%SZ", #else "%FT%TZ", diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx index 2bc1f335e..bb9b307dc 100644 --- a/src/UpdateWalk.cxx +++ b/src/UpdateWalk.cxx @@ -162,7 +162,7 @@ purge_deleted_from_directory(Directory *directory) } } -#ifndef G_OS_WIN32 +#ifndef WIN32 static int update_directory_stat(Directory *directory) { @@ -178,7 +178,7 @@ update_directory_stat(Directory *directory) static int find_inode_ancestor(Directory *parent, ino_t inode, dev_t device) { -#ifndef G_OS_WIN32 +#ifndef WIN32 while (parent) { if (!parent->have_stat && update_directory_stat(parent) < 0) return -1; diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index 8f31f45f7..e983c5c82 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -31,7 +31,7 @@ #include <assert.h> #include <string.h> -#ifdef G_OS_WIN32 +#ifdef WIN32 #include <windows.h> // for GetACP() #include <stdio.h> // for sprintf() #endif @@ -158,13 +158,13 @@ void Path::GlobalInit() charset = config_get_string(CONF_FS_CHARSET, NULL); if (charset == NULL) { -#ifndef G_OS_WIN32 +#ifndef WIN32 const gchar **encodings; g_get_filename_charsets(&encodings); if (encodings[0] != NULL && *encodings[0] != '\0') charset = encodings[0]; -#else /* G_OS_WIN32 */ +#else /* Glib claims that file system encoding is always utf-8 * on native Win32 (i.e. not Cygwin). * However this is true only if <gstdio.h> helpers are used. diff --git a/src/system/Resolver.cxx b/src/system/Resolver.cxx index 51a5b1ed7..656de1349 100644 --- a/src/system/Resolver.cxx +++ b/src/system/Resolver.cxx @@ -24,13 +24,13 @@ #include <glib.h> -#ifndef G_OS_WIN32 +#ifndef WIN32 #include <sys/socket.h> #include <netdb.h> -#else /* G_OS_WIN32 */ +#else #include <ws2tcpip.h> #include <winsock.h> -#endif /* G_OS_WIN32 */ +#endif #include <string.h> #include <stdio.h> diff --git a/src/system/SocketUtil.cxx b/src/system/SocketUtil.cxx index abaedb8e7..9c4002386 100644 --- a/src/system/SocketUtil.cxx +++ b/src/system/SocketUtil.cxx @@ -26,12 +26,12 @@ #include <unistd.h> -#ifndef G_OS_WIN32 +#ifndef WIN32 #include <sys/socket.h> -#else /* G_OS_WIN32 */ +#else #include <ws2tcpip.h> #include <winsock.h> -#endif /* G_OS_WIN32 */ +#endif #ifdef HAVE_IPV6 #include <string.h> |