fixup! Use glib WIN32 defines

This commit is contained in:
Patrick Griffis 2017-06-26 19:28:19 -04:00
parent 98ee2eeeb8
commit 5e5e3fe43b
6 changed files with 8 additions and 5 deletions

View File

@ -23,6 +23,9 @@
* Jim Seymour (jseymour@LinxNet.com) * Jim Seymour (jseymour@LinxNet.com)
*/ */
#include "config.h"
#include <glib.h>
/* Required to make lseek use off64_t, but doesn't work on Windows */ /* Required to make lseek use off64_t, but doesn't work on Windows */
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64

View File

@ -54,7 +54,7 @@
/* force a 32bit CMP.L */ /* force a 32bit CMP.L */
#define WORDL(c0, c1, c2, c3) (guint32)(c0 | (c1 << 8) | (c2 << 16) | (c3 << 24)) #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 OFLAGS O_BINARY
#define sleep(t) Sleep(t*1000) #define sleep(t) Sleep(t*1000)
#include <direct.h> #include <direct.h>

View File

@ -22,7 +22,7 @@
#ifndef HEXCHAT_INET_H #ifndef HEXCHAT_INET_H
#define HEXCHAT_INET_H #define HEXCHAT_INET_H
#ifndef WIN32 #ifndef G_OS_WIN32
#ifdef WANTSOCKET #ifdef WANTSOCKET
#include <sys/types.h> #include <sys/types.h>

View File

@ -20,7 +20,7 @@
#ifndef HEXCHAT_TYPEDEF_H #ifndef HEXCHAT_TYPEDEF_H
#define HEXCHAT_TYPEDEF_H #define HEXCHAT_TYPEDEF_H
#ifdef WIN32 #ifdef G_OS_WIN32
#ifndef SSIZE_T_DEFINED #ifndef SSIZE_T_DEFINED
#ifdef ssize_t #ifdef ssize_t

View File

@ -60,7 +60,7 @@ int strip_color2 (const char *src, int len, char *dst, int flags);
int strip_hidden_attribute (char *src, char *dst); int strip_hidden_attribute (char *src, char *dst);
char *errorstring (int err); char *errorstring (int err);
int waitline (int sok, char *buf, int bufsize, int); int waitline (int sok, char *buf, int bufsize, int);
#ifdef WIN32 #ifdef G_OS_WIN32
int waitline2 (GIOChannel *source, char *buf, int bufsize); int waitline2 (GIOChannel *source, char *buf, int bufsize);
int get_cpu_arch (void); int get_cpu_arch (void);
#else #else

View File

@ -24,7 +24,7 @@
#define DISPLAY_NAME "HexChat" #define DISPLAY_NAME "HexChat"
#ifndef WIN32 #ifndef G_OS_WIN32
#include <sys/types.h> #include <sys/types.h>
#endif #endif