From b4c1927e2747ea2b4f79e7c8d3c353c34467d421 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 May 2006 13:31:43 +0200 Subject: [PATCH] (MSVC 2003) Buildfixes --- network/netplay/netplay.c | 9 ++++++++- network/netplay/netplay_net.c | 9 ++++++++- ui/drivers/ui_win32.c | 4 ---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c index 9996e062f5..a716b5b79b 100644 --- a/network/netplay/netplay.c +++ b/network/netplay/netplay.c @@ -85,7 +85,14 @@ static int init_tcp_connection(const struct addrinfo *res, #if defined(IPPROTO_TCP) && defined(TCP_NODELAY) { int flag = 1; - if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(int)) < 0) + if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, +#ifdef _WIN32 + (const char*) +#else + (const void*) +#endif + &flag, + sizeof(int)) < 0) RARCH_WARN("Could not set netplay TCP socket to nodelay. Expect jitter.\n"); } #endif diff --git a/network/netplay/netplay_net.c b/network/netplay/netplay_net.c index a9472ef039..f9cb1c549f 100644 --- a/network/netplay/netplay_net.c +++ b/network/netplay/netplay_net.c @@ -139,7 +139,14 @@ static bool netplay_net_pre_frame(netplay_t *netplay) #if defined(IPPROTO_TCP) && defined(TCP_NODELAY) { int flag = 1; - if (setsockopt(netplay->fd, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(int)) < 0) + if (setsockopt(netplay->fd, IPPROTO_TCP, TCP_NODELAY, +#ifdef _WIN32 + (const char*) +#else + (const void*) +#endif + &flag, + sizeof(int)) < 0) RARCH_WARN("Could not set netplay TCP socket to nodelay. Expect jitter.\n"); } #endif diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index 8a22a54b75..41b5e99dbb 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -30,10 +30,6 @@ #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #endif -#ifndef _WIN32_IE -#define _WIN32_IE 0x0300 -#endif - #include "../../gfx/common/win32_common.h" #include #include