aboutsummaryrefslogtreecommitdiffstats
path: root/sock.h
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2008-06-30 00:41:39 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2008-06-30 00:41:39 +0100
commitf5d1b3185140e690a6503b9e68c7ea28655b405e (patch)
treef679a139ecca219aa2c7a07adcaefd3000c8c801 /sock.h
parentcd63d5822e76a6126bb3017567c9ce2869a44e0b (diff)
parent913545e54123296fb8229ecad2c77a6e899e0242 (diff)
Merging changes from Jelmer: It's now possible to cross-compile a Windows
version of BitlBee from Linux. No working SSL support yet though!
Diffstat (limited to 'sock.h')
-rw-r--r--sock.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/sock.h b/sock.h
index c3c0428e..848dc466 100644
--- a/sock.h
+++ b/sock.h
@@ -15,17 +15,11 @@
#endif
#else
# include <winsock2.h>
-# ifndef _MSC_VER
-# include <ws2tcpip.h>
-# endif
+# include <ws2tcpip.h>
# if !defined(BITLBEE_CORE) && defined(_MSC_VER)
# pragma comment(lib,"bitlbee.lib")
# endif
# include <io.h>
-# define read(a,b,c) recv(a,b,c,0)
-# define write(a,b,c) send(a,b,c,0)
-# define umask _umask
-# define mode_t int
# define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
# define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }
# define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK)