From 5e5e3fe43b17db9beb2c4f44c80f117b697d5d0d Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Mon, 26 Jun 2017 19:28:19 -0400
Subject: [PATCH] fixup! Use glib WIN32 defines

---
 src/common/dcc.c     | 3 +++
 src/common/hexchat.h | 2 +-
 src/common/inet.h    | 2 +-
 src/common/typedef.h | 2 +-
 src/common/util.h    | 2 +-
 src/fe-gtk/fe-gtk.h  | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/common/dcc.c b/src/common/dcc.c
index 064a6f81..3ada2b67 100644
--- 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
 
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 38a3e830..f50affb9 100644
--- 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>
diff --git a/src/common/inet.h b/src/common/inet.h
index 7056d473..3a1237b7 100644
--- 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>
diff --git a/src/common/typedef.h b/src/common/typedef.h
index 2034f923..d5d68271 100644
--- 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
diff --git a/src/common/util.h b/src/common/util.h
index 947b1a8a..45d92f3a 100644
--- 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
diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h
index ab776f63..5fb74fba 100644
--- 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