(svn r1970) Fix some warnings which Cygwin showed

4 files changed, 22 insertions, 21 deletions

diff --git a/network.c b/network.c
index ea19f73f7..69633b693 100644
--- a/network.c
+++ b/network.c
@@ -332,9 +332,8 @@ static void NetworkFindIPs(void)
 	// If something fails, make sure the list is empty
 	_network_ip_list[0] = 0;
 
-	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-		return;
-	}
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock == INVALID_SOCKET) return;
 
 #ifdef WIN32
 	// On windows it is easy
diff --git a/network_core.h b/network_core.h
index 337de1853..3130ce2e3 100644
--- a/network_core.h
+++ b/network_core.h
@@ -150,7 +150,11 @@ typedef unsigned long in_addr_t;
 
 static inline bool SetNonBlocking(int d)
 {
+	#ifdef WIN32
+	u_long nonblocking = 1;
+	#else
 	int nonblocking = 1;
+	#endif
 	#if defined(__BEOS__) && defined(BEOS_NET_SERVER)
 	return setsockopt(d, SOL_SOCKET, SO_NONBLOCK, &nonblocking, sizeof(nonblocking)) == 0;
 	#else
diff --git a/network_data.h b/network_data.h
index 18a0a2a1b..cc927150c 100644
--- a/network_data.h
+++ b/network_data.h
@@ -110,7 +110,7 @@ typedef enum {
 
 // To keep the clients all together
 typedef struct NetworkClientState {
-	int socket;
+	SOCKET socket;
 	uint16 index;
 	uint32 last_frame;
 	uint32 last_frame_server;
diff --git a/win32.c b/win32.c
index 60e7d2915..a5620e1d6 100644
--- a/win32.c
+++ b/win32.c
@@ -135,23 +135,20 @@ static const VkMapping _vk_mapping[] = {
 	AS(VK_MULTIPLY,		WKC_NUM_MUL),
 	AS(VK_SUBTRACT,		WKC_NUM_MINUS),
 	AS(VK_ADD,				WKC_NUM_PLUS),
-	AS(VK_DECIMAL,		WKC_NUM_DECIMAL),
-	{0}
+	AS(VK_DECIMAL,		WKC_NUM_DECIMAL)
 };
 
-static uint MapWindowsKey(uint key)
+static uint MapWindowsKey(uint sym)
 {
-	const VkMapping	*map = _vk_mapping - 1;
-	uint from;
-	do {
-		map++;
-		from = map->vk_from;
-		if (from == 0) {
-			return 0; // Unknown key pressed.
-			}
-	}	while ((uint)(key - from) > map->vk_count);
+	const VkMapping *map;
+	uint key = 0;
 
-	key = key - from + map->map_to;
+	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
+		if ((uint)(sym - map->vk_from) <= map->vk_count) {
+			key = sym - map->vk_from + map->map_to;
+			break;
+		}
+	}
 
 	if (GetAsyncKeyState(VK_SHIFT)<0)	key |= WKC_SHIFT;
 	if (GetAsyncKeyState(VK_CONTROL)<0)	key |= WKC_CTRL;
@@ -1500,7 +1497,8 @@ static FiosItem *FiosAlloc(void)
 	return &_fios_items[_fios_count++];
 }
 
-static HANDLE MyFindFirstFile(char *path, char *file, WIN32_FIND_DATA *fd)
+static HANDLE MyFindFirstFile(const char *path, const char *file,
+	WIN32_FIND_DATA *fd)
 {
 	char paths[MAX_PATH];
 
@@ -1842,7 +1840,7 @@ const DriverDesc _video_driver_descs[] = {
 #endif
 	{"win32", "Win32 GDI Video Driver",	&_win32_video_driver,		Windows_NT3_51},
 	{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
-	{NULL}
+	{ NULL, NULL, NULL, 0 }
 };
 
 const DriverDesc _sound_driver_descs[] = {
@@ -1851,7 +1849,7 @@ const DriverDesc _sound_driver_descs[] = {
 	{"sdl", "SDL Sound Driver",				&_sdl_sound_driver,		1},
 #endif
 	{"win32", "Win32 WaveOut Driver",	&_win32_sound_driver,	Windows_NT3_51},
-	{NULL}
+	{ NULL, NULL, NULL, 0 }
 };
 
 const DriverDesc _music_driver_descs[] = {
@@ -1861,7 +1859,7 @@ const DriverDesc _music_driver_descs[] = {
 #endif
 	// Win32 MIDI driver has higher priority than DMusic, so this one is chosen
 	{"win32", "Win32 MIDI Driver",	&_win32_music_driver,				Windows_NT3_51},
-	{NULL}
+	{ NULL, NULL, NULL, 0 }
 };
 
 byte GetOSVersion(void)