fixup! Use glib WIN32 defines

2017-06-26 19:28:19 -04:00 · 2017-06-26 19:24:18 -04:00 · 2017-06-26 19:21:31 -04:00 · 2017-06-26 19:14:52 -04:00
62 changed files with 199 additions and 200 deletions
--- a/meson.build
+++ b/meson.build
@ -75,11 +75,6 @@ endif
 configure_file(output: 'config.h', configuration: config_h)
 config_h_include = include_directories('.')

-if host_machine.system() == 'windows'
-  add_project_arguments('-DWIN32', language: 'c')
-endif
-
-
 global_cflags = []
 test_cflags = [
  '-pipe',
--- a/plugins/checksum/checksum.vcxproj
+++ b/plugins/checksum/checksum.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/exec/exec.vcxproj
+++ b/plugins/exec/exec.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -38,7 +38,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/fishlim/fishlim.vcxproj
+++ b/plugins/fishlim/fishlim.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/lua/lua.vcxproj
+++ b/plugins/lua/lua.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -39,7 +39,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/mpcinfo/mpcinfo.vcxproj
+++ b/plugins/mpcinfo/mpcinfo.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@ -27,7 +27,7 @@
 #ifdef ENABLE_NLS
 #include <locale.h>
 #endif
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <stdbool.h>
 #else
@ -44,7 +44,7 @@ static hexchat_plugin *ph;		  /* plugin handle */

 static int perl_load_file (char *script_name);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 /* STRINGIFY is from perl's CORE/config.h */
 #ifndef PERL_REQUIRED_VERSION
 	#define PERL_REQUIRED_VERSION STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION)
@ -75,7 +75,7 @@ thread_mbox (char *str)

 /* leave this before XSUB.h, to avoid readdir() being redefined */

-#ifdef WIN32
+#ifdef G_OS_WIN32
 static void
 perl_auto_load_from_path (const char *path)
 {
@ -130,7 +130,7 @@ perl_auto_load (void *unused)
 {
 	const char *xdir;
 	char *sub_dir;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	int copied = 0;
 	char *slash = NULL;
 #endif
@ -1019,7 +1019,7 @@ XS (XS_HexChat_hook_fd)
 		package = ST (4);
 		data = NULL;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 		if ((flags & HEXCHAT_FD_NOTSOCKET) == 0) {
 			/* this _get_osfhandle if from win32iop.h in the perl distribution,
 			 *  not the one provided by Windows
@ -1434,7 +1434,7 @@ perl_init (void)
 static int
 perl_load_file (char *filename)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	static HMODULE lib = NULL;

 	if (!lib) {
--- a/plugins/perl/perl.vcxproj
+++ b/plugins/perl/perl.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -49,7 +49,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <sys/types.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <direct.h>
 #else
 #include <unistd.h>
@ -106,7 +106,7 @@
 #define PyUnicode_FromString PyString_FromString
 #define PyUnicode_AsUTF8 PyString_AsString

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #undef WITH_THREAD
 #endif
 #endif
@ -790,7 +790,7 @@ static int
 Callback_ThreadTimer(void *userdata)
 {
 	RELEASE_XCHAT_LOCK();
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	usleep(1);
 #endif
 	ACQUIRE_XCHAT_LOCK();
@ -1530,7 +1530,7 @@ Plugin_New(char *filename, PyObject *xcoobj)
 	PySys_SetObject("stderr", xcoobj);

 	if (filename) {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		char *file;
 		if (!g_file_get_contents_utf8(filename, &file, NULL, NULL)) {
 			hexchat_printf(ph, "Can't open file %s: %s\n",
--- a/plugins/python/python2.vcxproj
+++ b/plugins/python/python2.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/python/python3.vcxproj
+++ b/plugins/python/python3.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/sysinfo/format.c
+++ b/plugins/sysinfo/format.c
@ -74,7 +74,7 @@ sysinfo_format_disk (guint64 total, guint64 free)
 	char *total_fmt, *free_fmt, *used_fmt, *ret;
 	GFormatSizeFlags format_flags = G_FORMAT_SIZE_DEFAULT;

-#ifdef WIN32 /* Windows uses IEC size (with SI format) */
+#ifdef G_OS_WIN32 /* Windows uses IEC size (with SI format) */
 	format_flags = G_FORMAT_SIZE_IEC_UNITS;
 #endif

--- a/plugins/sysinfo/sysinfo.vcxproj
+++ b/plugins/sysinfo/sysinfo.vcxproj
@ -30,7 +30,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    </ClCompile>
@ -43,7 +43,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    </ClCompile>
--- a/plugins/upd/upd.vcxproj
+++ b/plugins/upd/upd.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/winamp/winamp.vcxproj
+++ b/plugins/winamp/winamp.vcxproj
@ -29,12 +29,12 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup>
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@ -31,7 +31,7 @@
 #include "hexchatc.h"
 #include "typedef.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@ -290,7 +290,7 @@ cfg_get_int (char *cfg, char *var)

 char *xdir = NULL;	/* utf-8 encoding */

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <shlobj.h>
 #endif
@ -300,7 +300,7 @@ get_xdir (void)
 {
 	if (!xdir)
 	{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 		xdir = g_build_filename (g_get_user_config_dir (), HEXCHAT_DIR, NULL);
 #else
 		wchar_t* roaming_path_wide;
@ -373,7 +373,7 @@ const struct prefs vars[] =
 	{"dcc_blocksize", P_OFFINT (hex_dcc_blocksize), TYPE_INT},
 	{"dcc_completed_dir", P_OFFSET (hex_dcc_completed_dir), TYPE_STR},
 	{"dcc_dir", P_OFFSET (hex_dcc_dir), TYPE_STR},
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	{"dcc_fast_send", P_OFFINT (hex_dcc_fast_send), TYPE_BOOL},
 #endif
 	{"dcc_global_max_get_cps", P_OFFINT (hex_dcc_global_max_get_cps), TYPE_INT},
@ -527,7 +527,7 @@ const struct prefs vars[] =
 	{"irc_whois_front", P_OFFINT (hex_irc_whois_front), TYPE_BOOL},

 	{"net_auto_reconnect", P_OFFINT (hex_net_auto_reconnect), TYPE_BOOL},
-#ifndef WIN32	/* FIXME fix reconnect crashes and remove this ifdef! */
+#ifndef G_OS_WIN32	/* FIXME fix reconnect crashes and remove this ifdef! */
 	{"net_auto_reconnectonfail", P_OFFINT (hex_net_auto_reconnectonfail), TYPE_BOOL},
 #endif
 	{"net_bind_host", P_OFFSET (hex_net_bind_host), TYPE_STR},
@ -590,7 +590,7 @@ convert_with_fallback (char *str, const char *fallback)
 {
 	char *utf;

-#ifndef WIN32
+#ifndef G_OS_WIN32
 	/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
 	utf = g_locale_to_utf8 (str, -1, NULL, NULL, 0);

@ -714,7 +714,7 @@ load_default_config(void)
 	char *username, *realname, *langs;
 	const char *font;
 	char *sp;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	wchar_t* roaming_path_wide;
 	gchar* roaming_path;
 #endif
@ -740,7 +740,7 @@ load_default_config(void)
 	prefs.hex_away_show_once = 1;
 	prefs.hex_away_track = 1;
 	prefs.hex_dcc_auto_resume = 1;
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	prefs.hex_dcc_fast_send = 1;
 #endif
 	prefs.hex_gui_autoopen_chat = 1;
@ -840,7 +840,7 @@ load_default_config(void)
 	/* STRINGS */
 	strcpy (prefs.hex_away_reason, _("I'm busy"));
 	strcpy (prefs.hex_completion_suffix, ",");
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (portable_mode () || SHGetKnownFolderPath (&FOLDERID_Downloads, 0, NULL, &roaming_path_wide) != S_OK)
 	{
 		g_snprintf (prefs.hex_dcc_dir, sizeof (prefs.hex_dcc_dir), "%s\\downloads", get_xdir ());
@ -1061,7 +1061,7 @@ save_config (void)
 		return 0;
 	}

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_unlink (config);	/* win32 can't rename to an existing file */
 #endif
 	if (g_rename (new_config, config) == -1)
--- a/src/common/chanopt.c
+++ b/src/common/chanopt.c
@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <errno.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@ -95,13 +95,13 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
--- a/src/common/ctcp.c
+++ b/src/common/ctcp.c
@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

@ -138,7 +138,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,

 	if (!g_ascii_strcasecmp (msg, "VERSION") && !prefs.hex_irc_hide_version)
 	{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		g_snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
 					 get_cpu_arch (), get_sys_str (1));
 #else
@ -172,7 +172,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 			}

 			/* don't let IRCers specify path */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 			if (strchr (word[5], '/') == NULL && strchr (word[5], '\\') == NULL)
 #else
 			if (strchr (word[5], '/') == NULL)
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@ -23,6 +23,9 @@
 * Jim Seymour (jseymour@LinxNet.com)
 */

+#include "config.h"
+#include <glib.h>
+
 /* Required to make lseek use off64_t, but doesn't work on Windows */
 #define _FILE_OFFSET_BITS 64

@ -39,7 +42,7 @@
 #define WANTDNS
 #include "inet.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
 #else
@ -59,7 +62,7 @@
 #include "hexchatc.h"

 /* Setting _FILE_OFFSET_BITS to 64 doesn't change lseek to use off64_t on Windows, so override lseek to the version that does */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #define lseek _lseeki64
 #endif

@ -790,7 +793,7 @@ dcc_did_connect (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
 {
 	int er;
 	
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (condition & G_IO_ERR)
 	{
 		int len;
@ -2452,7 +2455,7 @@ dcc_add_file (session *sess, char *file, guint64 size, int port, char *nick, gui
 			strcat (dcc->destfile, G_DIR_SEPARATOR_S);
 		if (prefs.hex_dcc_save_nick)
 		{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 			char *t = strlen (dcc->destfile) + dcc->destfile;
 			strcpy (t, nick);
 			while (*t)
--- a/src/common/hexchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@ -406,7 +406,7 @@ int
 hexchat_pluginpref_list (hexchat_plugin *ph,
 		char *dest);

-#if !defined(PLUGIN_C) && (defined(WIN32) || defined(__CYGWIN__))
+#if !defined(PLUGIN_C) && (defined(_WIN32) || defined(__CYGWIN__))
 #ifndef HEXCHAT_PLUGIN_HANDLE
 #define HEXCHAT_PLUGIN_HANDLE (ph)
 #endif
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "config.h"
+#include <glib.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@ -26,7 +29,7 @@
 #define WANTSOCKET
 #include "inet.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #else
 #include <sys/wait.h>
@ -567,7 +570,7 @@ new_ircwindow (server *serv, char *name, int type, int focus)
 static void
 exec_notify_kill (session * sess)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	struct nbexec *re;
 	if (sess->running_exec != NULL)
 	{
@ -811,7 +814,7 @@ xchat_init (void)
 {
 	char buf[3068];

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	WSADATA wsadata;

 	if (WSAStartup(0x0202, &wsadata) != 0)
@ -841,7 +844,7 @@ xchat_init (void)
 	sigemptyset (&act.sa_mask);
 	sigaction (SIGUSR2, &act, NULL);
 #else
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	/* good enough for these old systems */
 	signal (SIGPIPE, SIG_IGN);
 #endif
@ -1019,7 +1022,7 @@ hexchat_exec (const char *cmd)
 static void
 set_locale (void)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	char hexchat_lang[13];	/* LC_ALL= plus 5 chars of hex_gui_lang and trailing \0 */

 	strcpy (hexchat_lang, "LC_ALL=");
@ -1039,7 +1042,7 @@ main (int argc, char *argv[])
 	int i;
 	int ret;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	HRESULT coinit_result;
 #endif

@ -1105,7 +1108,7 @@ main (int argc, char *argv[])
 	libproxy_factory = px_proxy_factory_new();
 #endif

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	coinit_result = CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
 	if (SUCCEEDED (coinit_result))
 	{
@ -1127,7 +1130,7 @@ main (int argc, char *argv[])
 		fe_message (buf, FE_MSG_ERROR);
 	}

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #ifndef __EMX__
 	/* OS/2 uses UID 0 all the time */
 	if (getuid () == 0)
@ -1140,7 +1143,7 @@ main (int argc, char *argv[])

 	fe_main ();

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (SUCCEEDED (coinit_result))
 	{
 		CoUninitialize ();
@ -1151,7 +1154,7 @@ main (int argc, char *argv[])
 	px_proxy_factory_free(libproxy_factory);
 #endif

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	WSACleanup ();
 #endif

--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@ -54,7 +54,7 @@
 /* force a 32bit CMP.L */
 #define WORDL(c0, c1, c2, c3) (guint32)(c0 | (c1 << 8) | (c2 << 16) | (c3 << 24))

-#ifdef WIN32						/* for win32 */
+#ifdef G_OS_WIN32						/* for win32 */
 #define OFLAGS O_BINARY
 #define sleep(t) Sleep(t*1000)
 #include <direct.h>
--- a/src/common/ignore.c
+++ b/src/common/ignore.c
@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <time.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/common/inet.h
+++ b/src/common/inet.h
@ -22,7 +22,7 @@
 #ifndef HEXCHAT_INET_H
 #define HEXCHAT_INET_H

-#ifndef WIN32
+#ifndef G_OS_WIN32

 #ifdef WANTSOCKET
 #include <sys/types.h>
--- a/src/common/make-te.vcxproj
+++ b/src/common/make-te.vcxproj
@ -28,7 +28,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -36,7 +36,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
--- a/src/common/network.c
+++ b/src/common/network.c
@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <glib.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

--- a/src/common/notify.c
+++ b/src/common/notify.c
@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <time.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@ -28,7 +28,7 @@
 #define WANTARPA
 #include "inet.h"

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <sys/wait.h>
 #include <unistd.h>
 #endif
@ -1489,7 +1489,7 @@ cmd_echo (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	return TRUE;
 }

-#ifndef WIN32
+#ifndef G_OS_WIN32

 static void
 exec_check_process (struct session *sess)
@ -3973,7 +3973,7 @@ const struct commands xc_cmds[] = {
 	{"DNS", cmd_dns, 0, 0, 1, N_("DNS <nick|host|ip>, Resolves an IP or hostname")},
 	{"DOAT", cmd_doat, 0, 0, 1, N_("DOAT <channel,list,/network> <command>")},
 	{"ECHO", cmd_echo, 0, 0, 1, N_("ECHO <text>, Prints text locally")},
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	{"EXEC", cmd_exec, 0, 0, 1,
 	 N_("EXEC [-o] <command>, runs the command. If -o flag is used then output is sent to current channel, else is printed to current text box")},
 #ifndef __EMX__
--- a/src/common/plugin-timer.c
+++ b/src/common/plugin-timer.c
@ -24,10 +24,6 @@
 #include <glib.h>
 #include "hexchat-plugin.h"

-#ifdef WIN32
-#define g_ascii_strcasecmp stricmp
-#endif
-
 #define _(x) hexchat_gettext(ph,x)

 static hexchat_plugin *ph;	/* plugin handle */
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@ -206,7 +206,7 @@ hexchat_dummy (hexchat_plugin *ph)
 	return NULL;
 }

-#ifdef WIN32
+#ifdef G_OS_WIN32
 static int
 hexchat_read_fd (hexchat_plugin *ph, GIOChannel *source, char *buf, int *len)
 {
@ -268,7 +268,7 @@ plugin_add (session *sess, char *filename, void *handle, void *init_func,
 		pl->hexchat_plugingui_add = hexchat_plugingui_add;
 		pl->hexchat_plugingui_remove = hexchat_plugingui_remove;
 		pl->hexchat_emit_print = hexchat_emit_print;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		pl->hexchat_read_fd = (void *) hexchat_read_fd;
 #else
 		pl->hexchat_read_fd = hexchat_dummy;
@ -448,7 +448,7 @@ plugin_auto_load (session *sess)
 	lib_dir = plugin_get_libdir ();
 	sub_dir = g_build_filename (get_xdir (), "addons", NULL);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* a long list of bundled plugins that should be loaded automatically,
 	 * user plugins should go to <config>, leave Program Files alone! */
 	for_files (lib_dir, "hcchecksum.dll", plugin_auto_load_cb);
@ -1808,7 +1808,7 @@ hexchat_pluginpref_set_str_real (hexchat_plugin *pl, const char *var, const char
 			buffer_tmp = g_build_filename (get_xdir (), confname_tmp, NULL);
 			g_free (confname_tmp);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 			g_unlink (buffer);
 #endif

@ -1886,7 +1886,7 @@ hexchat_pluginpref_set_str_real (hexchat_plugin *pl, const char *var, const char
 		buffer_tmp = g_build_filename (get_xdir (), confname_tmp, NULL);
 		g_free (confname_tmp);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 		g_unlink (buffer);
 #endif

--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <stdarg.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

--- a/src/common/server.c
+++ b/src/common/server.c
@ -31,7 +31,7 @@
 #define WANTARPA
 #include "inet.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <winbase.h>
 #include <io.h>
 #else
@ -382,7 +382,7 @@ server_connected (server * serv)
 	fe_server_event (serv, FE_SE_CONNECT, 0);
 }

-#ifdef WIN32
+#ifdef G_OS_WIN32

 static gboolean
 server_close_pipe (int *pipefd)	/* see comments below */
@ -410,7 +410,7 @@ server_stopconnecting (server * serv)
 		serv->joindelay_tag = 0;
 	}

-#ifndef WIN32
+#ifndef G_OS_WIN32
 	/* kill the child process trying to connect */
 	kill (serv->childpid, SIGKILL);
 	waitpid (serv->childpid, NULL, 0);
@ -703,7 +703,7 @@ auto_reconnect (server *serv, int send_quit, int err)
 	if (del < 1000)
 		del = 500;				  /* so it doesn't block the gui */

-#ifndef WIN32
+#ifndef G_OS_WIN32
 	if (err == -1 || err == 0 || err == ECONNRESET || err == ETIMEDOUT)
 #else
 	if (err == -1 || err == 0 || err == WSAECONNRESET || err == WSAETIMEDOUT)
@ -1489,7 +1489,7 @@ xit:
 		net_store_destroy (ns_proxy);

 	/* no need to free ip/real_hostname, this process is exiting */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* under win32 we use a thread -> shared memory, must free! */
 	g_free (proxy_ip);
 	g_free (ip);
@ -1580,7 +1580,7 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 	fe_set_away (serv);
 	server_flush_queue (serv);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (_pipe (read_des, 4096, _O_BINARY) < 0)
 #else
 	if (pipe (read_des) < 0)
@ -1598,7 +1598,7 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 	serv->proxy_sok4 = -1;
 	serv->proxy_sok6 = -1;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	CloseHandle (CreateThread (NULL, 0,
 										(LPTHREAD_START_ROUTINE)server_child,
 										serv, 0, (DWORD *)&pid));
@ -1623,7 +1623,7 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 	}
 #endif
 	serv->childpid = pid;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	serv->iotag = fe_input_add (serv->childread, FIA_READ|FIA_FD, server_read_child,
 #else
 	serv->iotag = fe_input_add (serv->childread, FIA_READ, server_read_child,
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

@ -1131,7 +1131,7 @@ servlist_save (void)
 	GSList *netlist;
 	GSList *cmdlist;
 	GSList *favlist;
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	int first = FALSE;

 	buf = g_build_filename (get_xdir (), "servlist.conf", NULL);
@ -1142,13 +1142,13 @@ servlist_save (void)
 	fp = hexchat_fopen_file ("servlist.conf", "w", 0);
 	if (!fp)
 	{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 		g_free (buf);
 #endif
 		return FALSE;
 	}

-#ifndef WIN32
+#ifndef G_OS_WIN32
 	if (first)
 		g_chmod (buf, 0600);

--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@ -26,7 +26,7 @@
 #include <openssl/ssl.h>		  /* SSL_() */
 #include <openssl/err.h>		  /* ERR_() */
 #include <openssl/x509v3.h>
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <openssl/rand.h>		  /* RAND_seed() */
 #endif
 #include "config.h"
--- a/src/common/text.c
+++ b/src/common/text.c
@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@ -43,7 +43,7 @@
 #include "hexchatc.h"
 #include "text.h"
 #include "typedef.h"
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #endif

@ -407,7 +407,7 @@ log_create_filename (char *channame)
 		mbl = g_utf8_skip[((unsigned char *)tmp)[0]];
 		if (mbl == 1)
 		{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 			*tmp = rfc_tolower (*tmp);
 			if (*tmp == '/')
 #else
@ -2191,7 +2191,7 @@ sound_play (const char *file, gboolean quiet)
 {
 	char *buf;
 	char *wavfile;
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	char *cmd;
 #endif

@ -2213,7 +2213,7 @@ sound_play (const char *file, gboolean quiet)

 	if (g_access (wavfile, R_OK) == 0)
 	{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gunichar2 *wavfile_utf16 = g_utf8_to_utf16 (wavfile, -1, NULL, NULL, NULL);

 		if (wavfile_utf16 != NULL)
--- a/src/common/typedef.h
+++ b/src/common/typedef.h
@ -20,7 +20,7 @@
 #ifndef HEXCHAT_TYPEDEF_H
 #define HEXCHAT_TYPEDEF_H

-#ifdef WIN32
+#ifdef G_OS_WIN32

 #ifndef SSIZE_T_DEFINED
 #ifdef ssize_t
--- a/src/common/url.c
+++ b/src/common/url.c
@ -662,7 +662,7 @@ re_channel (void)
 }

 /*	PATH description --- */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 /* Windows path can be .\ ..\ or C: D: etc */
 #define FS_PATH "^(\\.{1,2}\\\\|[a-z]:).*"
 #else
--- a/src/common/util.c
+++ b/src/common/util.c
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "config.h"
+#include <glib.h>
+
 #define WANTSOCKET
 #include "inet.h"				/* make it first to avoid macro redefinitions */

@ -29,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <sys/timeb.h>
 #include <io.h>
 #include "./sysinfo/sysinfo.h"
@ -40,7 +43,6 @@
 #include <sys/utsname.h>
 #endif

-#include "config.h"
 #include <fcntl.h>
 #include <errno.h>
 #include "hexchat.h"
@ -56,7 +58,7 @@
 #ifdef USE_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rand.h>
-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <netinet/in.h>
 #endif
 #endif
@ -74,7 +76,7 @@ file_part (char *file)
 			case 0:
 				return (filepart);
 			case '/':
-#ifdef WIN32
+#ifdef G_OS_WIN32
 			case '\\':
 #endif
 				filepart = file + 1;
@ -117,7 +119,7 @@ errorstring (int err)
 		return "";
 	case 0:
 		return _("Remote host closed socket");
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	}
 #else
 	case WSAECONNREFUSED:
@ -205,7 +207,7 @@ waitline (int sok, char *buf, int bufsize, int use_recv)
 	}
 }

-#ifdef WIN32
+#ifdef G_OS_WIN32
 /* waitline2 using win32 file descriptor and glib instead of _read. win32 can't _read() sok! */
 int
 waitline2 (GIOChannel *source, char *buf, int bufsize)
@ -238,7 +240,7 @@ waitline2 (GIOChannel *source, char *buf, int bufsize)
 char *
 expand_homedir (char *file)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	char *user;
 	struct passwd *pw;

@ -454,7 +456,7 @@ get_cpu_info (double *mhz, int *cpus)
 }
 #endif

-#ifdef WIN32
+#ifdef G_OS_WIN32

 int
 get_cpu_arch (void)
@ -1008,7 +1010,7 @@ util_exec (const char *cmd)
 unsigned long
 make_ping_time (void)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	struct timeval timev;
 	gettimeofday (&timev, 0);
 #else
@ -1339,7 +1341,7 @@ canonalize_key (char *key)
 int
 portable_mode (void)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	static int is_portable = -1;

 	if (G_UNLIKELY(is_portable == -1))
@ -1496,7 +1498,7 @@ challengeauth_response (const char *username, const char *password, const char *
 size_t
 strftime_validated (char *dest, size_t destsize, const char *format, const struct tm *time)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	return strftime (dest, destsize, format, time);
 #else
 	char safe_format[64];
--- a/src/common/util.h
+++ b/src/common/util.h
@ -60,7 +60,7 @@ int strip_color2 (const char *src, int len, char *dst, int flags);
 int strip_hidden_attribute (char *src, char *dst);
 char *errorstring (int err);
 int waitline (int sok, char *buf, int bufsize, int);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 int waitline2 (GIOChannel *source, char *buf, int bufsize);
 int get_cpu_arch (void);
 #else
--- a/src/fe-gtk/banlist.c
+++ b/src/fe-gtk/banlist.c
@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <time.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <time.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/fe-gtk/dccgui.c
+++ b/src/fe-gtk/dccgui.c
@ -111,7 +111,7 @@ proper_unit (guint64 size, char *buf, size_t buf_len)
 	GFormatSizeFlags format_flags = G_FORMAT_SIZE_DEFAULT;

 #ifndef __APPLE__ /* OS X uses SI */
-#ifndef WIN32 /* Windows uses IEC size (with SI format) */
+#ifndef G_OS_WIN32 /* Windows uses IEC size (with SI format) */
 	if (prefs.hex_gui_filesize_iec) /* Linux can't decide... */
 #endif
 		format_flags = G_FORMAT_SIZE_IEC_UNITS;
@ -600,7 +600,7 @@ clear_completed (GtkWidget * wid, gpointer none)
 static void
 browse_folder (char *dir)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* no need for file:// in ShellExecute() */
 	fe_open_url (dir);
 #else
--- a/src/fe-gtk/editlist.c
+++ b/src/fe-gtk/editlist.c
@ -25,7 +25,7 @@

 #include <gdk/gdkkeysyms.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@ -22,7 +22,7 @@

 #include "fe-gtk.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
 #else
@ -94,7 +94,7 @@ static const GOptionEntry gopt_entries[] =
 {NULL}
 };

-#ifdef WIN32
+#ifdef G_OS_WIN32
 static void
 create_msg_dialog (gchar *title, gchar *message)
 {
@ -104,7 +104,7 @@ create_msg_dialog (gchar *title, gchar *message)
 	gtk_window_set_title (GTK_WINDOW (dialog), title);

 /* On Win32 we automatically have the icon. If we try to load it explicitly, it will look ugly for some reason. */
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	pixmaps_init ();
 	gtk_window_set_icon (GTK_WINDOW (dialog), pix_hexchat);
 #endif
@ -128,14 +128,14 @@ fe_args (int argc, char *argv[])
 #endif

 	context = g_option_context_new (NULL);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_option_context_set_help_enabled (context, FALSE);	/* disable stdout help as stdout is unavailable for subsystem:windows */
 #endif
 	g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (FALSE));
 	g_option_context_parse (context, &argc, &argv, &error);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (error)											/* workaround for argv not being available when using subsystem:windows */
 	{
 		if (error->message)								/* the error message contains argv so search for patterns in that */
@ -180,7 +180,7 @@ fe_args (int argc, char *argv[])
 	if (arg_show_version)
 	{
 		buffer = g_strdup_printf ("%s %s", PACKAGE_NAME, PACKAGE_VERSION);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gtk_init (&argc, &argv);
 		create_msg_dialog ("Version Information", buffer);
 #else
@ -194,7 +194,7 @@ fe_args (int argc, char *argv[])
 	if (arg_show_autoload)
 	{
 		buffer = g_strdup_printf ("%s%caddons%c", get_xdir(), G_DIR_SEPARATOR, G_DIR_SEPARATOR);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gtk_init (&argc, &argv);
 		create_msg_dialog ("Plugin/Script Auto-load Directory", buffer);
 #else
@ -208,7 +208,7 @@ fe_args (int argc, char *argv[])
 	if (arg_show_config)
 	{
 		buffer = g_strdup_printf ("%s%c", get_xdir(), G_DIR_SEPARATOR);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gtk_init (&argc, &argv);
 		create_msg_dialog ("User Config Directory", buffer);
 #else
@ -219,7 +219,7 @@ fe_args (int argc, char *argv[])
 		return 0;
 	}

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* this is mainly for irc:// URL handling. When windows calls us from */
 	/* I.E, it doesn't give an option of "Start in" directory, like short */
 	/* cuts can. So we have to set the current dir manually, to the path  */
@ -383,7 +383,7 @@ fe_timeout_remove (int tag)
 	g_source_remove (tag);
 }

-#ifdef WIN32
+#ifdef G_OS_WIN32

 static void
 log_handler (const gchar   *log_domain,
@ -443,7 +443,7 @@ fe_new_window (session *sess, int focus)

 	mg_changui_new (sess, NULL, tab, focus);

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_log_set_handler ("GLib", G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING, (GLogFunc)log_handler, 0);
 	g_log_set_handler ("GLib-GObject", G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING, (GLogFunc)log_handler, 0);
 	g_log_set_handler ("Gdk", G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING, (GLogFunc)log_handler, 0);
@ -505,7 +505,7 @@ fe_input_add (int sok, int flags, void *func, void *data)
 	int tag, type = 0;
 	GIOChannel *channel;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (flags & FIA_FD)
 		channel = g_io_channel_win32_new_fd (sok);
 	else
@ -676,7 +676,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp,
 void
 fe_beep (session *sess)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* Play the "Instant Message Notification" system sound
 	 */
 	if (!PlaySoundW (L"Notification.IM", NULL, SND_ALIAS | SND_ASYNC))
@ -937,7 +937,7 @@ fe_gui_info_ptr (session *sess, int info_type)
 	switch (info_type)
 	{
 	case 0:	/* native window pointer (for plugins) */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		return gdk_win32_window_get_impl_hwnd (gtk_widget_get_window (sess->gui->window));
 #else
 		return sess->gui->window;
@ -1057,7 +1057,7 @@ osx_show_uri (const char *url)
 static void
 fe_open_url_inner (const char *url)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	gunichar2 *url_utf16 = g_utf8_to_utf16 (url, -1, NULL, NULL, NULL);

 	if (url_utf16 == NULL)
@ -1084,7 +1084,7 @@ fe_open_url (const char *url)
 	/* gvfs likes file:// */
 	if (url_type == WORD_PATH)
 	{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 		uri = g_strconcat ("file://", url, NULL);
 		fe_open_url_inner (uri);
 		g_free (uri);
@ -1185,7 +1185,7 @@ fe_open_chan_list (server *serv, char *filter, int do_refresh)
 const char *
 fe_get_default_font (void)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (gtkutil_find_font ("Consolas"))
 		return "Consolas 10";
 	else
--- a/src/fe-gtk/fe-gtk.h
+++ b/src/fe-gtk/fe-gtk.h
@ -24,7 +24,7 @@

 #define DISPLAY_NAME "HexChat"

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <sys/types.h>
 #endif

--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
@ -41,7 +41,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <ctype.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@ -438,7 +438,7 @@ key_dialog_combo_changed (GtkCellRendererCombo *combo, gchar *pathstr,

 	if (actiontext)
 	{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		/* We need to manually update the store */
 		GtkTreePath *path;
 		GtkTreeIter iter;
@ -678,7 +678,7 @@ key_dialog_treeview_new (GtkWidget *box)

 	render = gtk_cell_renderer_accel_new ();
 	g_object_set (render, "editable", TRUE,
-#ifndef WIN32
+#ifndef G_OS_WIN32
 					"accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_OTHER,
 #endif
 					NULL);
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@ -40,7 +40,7 @@
 #include "gtkutil.h"
 #include "pixmaps.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@ -567,7 +567,7 @@ show_and_unfocus (GtkWidget * wid)
 void
 gtkutil_set_icon (GtkWidget *win)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	/* FIXME: Magically breaks icon rendering in most
 	 * (sub)windows, but OFC only on Windows. GTK <3
 	 */
@ -584,7 +584,7 @@ gtkutil_window_new (char *title, char *role, int width, int height, int flags)

 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtkutil_set_icon (win);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	gtk_window_set_wmclass (GTK_WINDOW (win), "HexChat", "hexchat");
 #endif
 	gtk_window_set_title (GTK_WINDOW (win), title);
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdio.h>

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@ -2377,7 +2377,7 @@ mg_create_meters (session_gui *gui, GtkWidget *parent_box)
 	if (prefs.hex_gui_lagometer & 1)
 	{
 		gui->lagometer = wid = gtk_progress_bar_new ();
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gtk_widget_set_size_request (wid, 1, 10);
 #else
 		gtk_widget_set_size_request (wid, 1, 8);
@ -2396,7 +2396,7 @@ mg_create_meters (session_gui *gui, GtkWidget *parent_box)
 	if (prefs.hex_gui_throttlemeter & 1)
 	{
 		gui->throttlemeter = wid = gtk_progress_bar_new ();
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		gtk_widget_set_size_request (wid, 1, 10);
 #else
 		gtk_widget_set_size_request (wid, 1, 8);
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <string.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
 #else
@ -905,7 +905,7 @@ menu_fullscreen_toggle (GtkWidget *wid, gpointer ud)
 	{
 		gtk_window_unfullscreen (GTK_WINDOW(parent_window));

-#ifdef WIN32
+#ifdef G_OS_WIN32
 		if (!prefs.hex_gui_win_state) /* not maximized */
 		{
 			/* other window managers seem to handle this */
@ -1716,12 +1716,12 @@ menu_about (GtkWidget *wid, gpointer sess)
 					"along with this program. If not, see <http://www.gnu.org/licenses/>";

 	g_snprintf  (comment, sizeof(comment), ""
-#ifdef WIN32
+#ifdef G_OS_WIN32
 				"Portable Mode: %s\n"
 				"Build Type: x%d\n"
 #endif
 				"OS: %s",
-#ifdef WIN32
+#ifdef G_OS_WIN32
 				(portable_mode () ? "Yes" : "No"),
 				get_cpu_arch (),
 #endif
--- a/src/fe-gtk/notifications/notifications-winrt.vcxproj
+++ b/src/fe-gtk/notifications/notifications-winrt.vcxproj
@ -36,7 +36,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <SDLCheck>true</SDLCheck>
      <AdditionalUsingDirectories>$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    </ClCompile>
@ -48,7 +48,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <SDLCheck>true</SDLCheck>
      <AdditionalUsingDirectories>$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    </ClCompile>
--- a/src/fe-gtk/palette.c
+++ b/src/fe-gtk/palette.c
@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@ -30,7 +30,7 @@
 #include "maingui.h"
 #include "menu.h"

-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif

@ -63,7 +63,7 @@ typedef GdkPixbuf* TrayIcon;
 static GtkStatusIcon *sticon;
 static gint flash_tag;
 static TrayStatus tray_status;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 static guint tray_menu_timer;
 static gint64 tray_menu_inactivetime;
 #endif
@ -481,12 +481,12 @@ tray_menu_destroy (GtkWidget *menu, gpointer userdata)
 {
 	gtk_widget_destroy (menu);
 	g_object_unref (menu);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_source_remove (tray_menu_timer);
 #endif
 }

-#ifdef WIN32
+#ifdef G_OS_WIN32
 static gboolean
 tray_menu_enter_cb (GtkWidget *menu)
 {
@ -547,7 +547,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
 		tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
 	tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);

-#ifndef WIN32 /* submenus are buggy on win32 */
+#ifndef G_OS_WIN32 /* submenus are buggy on win32 */
 	submenu = mg_submenu (menu, _("_Blink on"));
 	blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message"));
 	blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message"));
@ -579,7 +579,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
 	g_object_unref (menu);
 	g_signal_connect (G_OBJECT (menu), "selection-done",
 							G_CALLBACK (tray_menu_destroy), NULL);
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_signal_connect (G_OBJECT (menu), "leave-notify-event",
 							G_CALLBACK (tray_menu_left_cb), NULL);
 	g_signal_connect (G_OBJECT (menu), "enter-notify-event",
@ -802,7 +802,7 @@ tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name,
 int
 tray_plugin_deinit (hexchat_plugin *plugin_handle)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	tray_cleanup ();
 #endif
 	return 1;
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <stdlib.h>

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@ -39,7 +39,7 @@
 #include "plugin-tray.h"
 #include "notifications/notification-backend.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include "../common/fe.h"
 #endif
 #include "sexy-spell-entry.h"
@ -84,7 +84,7 @@ typedef struct
 	int extra;
 } setting;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 static const char *const langsmenu[] =
 {
 	N_("Afrikaans"),
@ -147,7 +147,7 @@ static const char *const langsmenu[] =
 static const setting appearance_settings[] =
 {
 	{ST_HEADER,	N_("General"),0,0,0},
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_MENU,   N_("Language:"), P_OFFINTNL(hex_gui_lang), 0, langsmenu, 0},
 	{ST_EFONT,  N_("Main font:"), P_OFFSETNL(hex_text_font_main), 0, 0, sizeof prefs.hex_text_font_main},
 #else
@ -166,7 +166,7 @@ static const setting appearance_settings[] =
 	{ST_HEADER,	N_("Time Stamps"),0,0,0},
 	{ST_TOGGLE, N_("Enable time stamps"), P_OFFINTNL(hex_stamp_text),0,0,1},
 	{ST_ENTRY,  N_("Time stamp format:"), P_OFFSETNL(hex_stamp_text_format),
-#ifdef WIN32
+#ifdef G_OS_WIN32
 					N_("See the strftime MSDN article for details."),0,sizeof prefs.hex_stamp_text_format},
 #else
 					N_("See the strftime manpage for details."),0,sizeof prefs.hex_stamp_text_format},
@ -195,7 +195,7 @@ static const setting inputbox_settings[] =
 	{ST_TOGGLE, N_("Show user mode icon in nick box"), P_OFFINTNL(hex_gui_input_icon),0,0,0},
 	{ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(hex_gui_input_spell),0,0,1},
 	{ST_ENTRY,	N_("Dictionaries to use:"), P_OFFSETNL(hex_text_spell_langs),0,0,sizeof prefs.hex_text_spell_langs},
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_LABEL,	N_("Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSeparate multiple entries with commas.")},
 #else
 	{ST_LABEL,	N_("Use language codes. Separate multiple entries with commas.")},
@ -403,7 +403,7 @@ static const setting alert_settings[] =
 	{ST_3OGGLE, N_("Show notifications on:"), 0, 0, (void *)balloonlist, 0},
 	{ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0},
 	{ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0},
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_3OGGLE, N_("Make a beep sound on:"), 0, N_("Play the \"Instant Message Notification\" system sound upon the selected events"), (void *)beeplist, 0},
 #else
 #ifdef USE_LIBCANBERRA
@ -447,7 +447,7 @@ static const setting alert_settings_nonotifications[] =
 	{ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0},
 #endif
 #endif
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_3OGGLE, N_("Make a beep sound on:"), 0, N_("Play the \"Instant Message Notification\" system sound upon the selected events"), (void *)beeplist, 0},
 #else
 #ifdef USE_LIBCANBERRA
@ -568,7 +568,7 @@ static const setting advanced_settings[] =

 	{ST_HEADER,	N_("Miscellaneous"), 0, 0, 0},
 	{ST_ENTRY,  N_("Real name:"), P_OFFSETNL(hex_irc_real_name), 0, 0, sizeof prefs.hex_irc_real_name},
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_ENTRY,  N_("Alternative fonts:"), P_OFFSETNL(hex_text_font_alternative), N_("Separate multiple entries with commas without spaces before or after."), 0, sizeof prefs.hex_text_font_alternative},
 #endif
 	{ST_TOGGLE,	N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0},
@ -593,7 +593,7 @@ static const setting logging_settings[] =
 	{ST_HEADER,	N_("Time Stamps"),0,0,0},
 	{ST_TOGGLE,	N_("Insert timestamps in logs"), P_OFFINTNL(hex_stamp_log), 0, 0, 1},
 	{ST_ENTRY,	N_("Log timestamp format:"), P_OFFSETNL(hex_stamp_log_format), 0, 0, sizeof prefs.hex_stamp_log_format},
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	{ST_LABEL,	N_("See the strftime MSDN article for details.")},
 #else
 	{ST_LABEL,	N_("See the strftime manpage for details.")},
@ -907,7 +907,7 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)
 	gtk_table_attach (GTK_TABLE (table), wid, 3, 6, row, row + 1,
 							GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);

-#ifndef WIN32 /* Windows always supports this */
+#ifndef G_OS_WIN32 /* Windows always supports this */
 	/* Only used for transparency currently */
 	if (!gtk_widget_is_composited (current_sess->gui->window))
 		gtk_widget_set_sensitive (wid, FALSE);
@ -1100,7 +1100,7 @@ setup_browsefile_cb (GtkWidget *button, GtkWidget *entry)
 	char *filter;
 	int filter_type;

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	filter = "*png;*.tiff;*.gif;*.jpeg;*.jpg";
 	filter_type = FRF_EXTENSIONS;
 #else
@ -1705,7 +1705,7 @@ setup_snd_browse_cb (GtkWidget *button, GtkEntry *entry)
 	char *sounds_dir = g_build_filename (get_xdir (), HEXCHAT_SOUND_DIR, NULL);
 	char *filter = NULL;
 	int filter_type;
-#ifdef WIN32 /* win32 only supports wav, others could support anything */
+#ifdef G_OS_WIN32 /* win32 only supports wav, others could support anything */
 	filter = "*.wav";
 	filter_type = FRF_EXTENSIONS;
 #else
@ -2081,7 +2081,7 @@ unslash (char *dir)
 	if (dir[0])
 	{
 		int len = strlen (dir) - 1;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		if (dir[len] == '/' || dir[len] == '\\')
 #else
 		if (dir[len] == '/')
@ -2152,7 +2152,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd)
 static void
 setup_apply (struct hexchatprefs *pr)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	PangoFontDescription *old_desc;
 	PangoFontDescription *new_desc;
 	char buffer[4 * FONTNAMELEN + 1];
@ -2168,7 +2168,7 @@ setup_apply (struct hexchatprefs *pr)

 #define DIFF(a) (pr->a != prefs.a)

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (DIFF (hex_gui_lang))
 		noapply = TRUE;
 #endif
@ -2232,7 +2232,7 @@ setup_apply (struct hexchatprefs *pr)

 	memcpy (&prefs, pr, sizeof (prefs));

-#ifdef WIN32
+#ifdef G_OS_WIN32
 	/* merge hex_font_main and hex_font_alternative into hex_font_normal */
 	old_desc = pango_font_description_from_string (prefs.hex_text_font_main);
 	sprintf (buffer, "%s,%s", pango_font_description_get_family (old_desc), prefs.hex_text_font_alternative);
@ -2260,7 +2260,7 @@ setup_apply (struct hexchatprefs *pr)
 		fe_message (_("Some settings were changed that require a"
 						" restart to take full effect."), FE_MSG_WARN);

-#ifndef WIN32
+#ifndef G_OS_WIN32
 	if (prefs.hex_dcc_auto_recv == 2) /* Auto */
 	{
 		if (!strcmp ((char *)g_get_home_dir (), prefs.hex_dcc_dir))
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@ -32,13 +32,13 @@
 #include <sys/stat.h>
 #include "sexy-iso-codes.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include "marshal.h"
 #else
 #include "../common/marshal.h"
 #endif

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include "../common/typedef.h"
 #include <io.h>
 #else
@ -164,7 +164,7 @@ initialize_enchant (void)
 	enchant = g_module_open("libenchant."G_MODULE_SUFFIX, 0);
 	if (enchant == NULL)
 	{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 		enchant = g_module_open("libenchant.so.1", 0);
 		if (enchant == NULL)
 		{
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@ -38,7 +38,7 @@
 #include "../common/hexchatc.h"
 #include "../common/url.h"

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include "marshal.h"
 #else
 #include "../common/marshal.h"
@ -50,7 +50,7 @@

 #define charlen(str) g_utf8_skip[*(guchar *)(str)]

-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
 #include <gdk/gdk.h>
@ -2068,7 +2068,7 @@ gtk_xtext_button_press (GtkWidget * widget, GdkEventButton * event)
 static gboolean
 gtk_xtext_selection_kill (GtkXText *xtext, GdkEventSelection *event)
 {
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	if (xtext->buffer->last_ent_start)
 		gtk_xtext_unselect (xtext);
 #endif
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@ -24,7 +24,7 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #define STDIN_FILENO 0
 #define STDOUT_FILENO 1
@ -135,7 +135,7 @@ timecat (char *buf, time_t stamp)
 }

 /* Windows doesn't handle ANSI codes in cmd.exe, need to not display them */
-#ifndef WIN32
+#ifndef G_OS_WIN32
 /*                               0  1  2  3  4  5  6  7   8   9  10  11  12  13  14 15 */
 static const short colconv[] = { 0, 7, 4, 2, 1, 3, 5, 11, 13, 12, 6, 16, 14, 15, 10, 7 };

@ -508,7 +508,7 @@ fe_args (int argc, char *argv[])

 	if (arg_show_autoload)
 	{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		/* see the chdir() below */
 		char *sl, *exe = g_strdup (argv[0]);
 		sl = strrchr (exe, '\\');
--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.vcxproj
@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -43,7 +43,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
Author	SHA1	Message	Date
Patrick Griffis	5e5e3fe43b	fixup! Use glib WIN32 defines	2017-06-26 19:28:19 -04:00
Patrick Griffis	98ee2eeeb8	fixup! Use glib WIN32 defines	2017-06-26 19:24:18 -04:00
Patrick Griffis	4d5e2874da	fixup! Use glib WIN32 defines	2017-06-26 19:21:31 -04:00
Patrick Griffis	8a6570862f	Use glib WIN32 defines	2017-06-26 19:14:52 -04:00