random win32 fixes

4 files changed, 11 insertions, 11 deletions

diff --git a/src/engine/datafile.c b/src/engine/datafile.c
index c11082ac..01c99a21 100644
--- a/src/engine/datafile.c
+++ b/src/engine/datafile.c
@@ -117,7 +117,7 @@ DATAFILE *datafile_load(const char *filename)
 	df = (DATAFILE*)mem_alloc(allocsize, 1);
 	df->header = header;
 	df->data_start_offset = sizeof(DATAFILE_HEADER) + size;
-	df->data_ptrs = (void*)(df+1);
+	df->data_ptrs = (char**)(df+1);
 	df->data = (char *)(df+1)+header.num_raw_data*sizeof(char *);
 	df->file = file;
 	
@@ -227,7 +227,7 @@ void *datafile_get_data(DATAFILE *df, int index)
 			
 			/* decompress the data, TODO: check for errors */
 			unsigned long s = uncompressed_size;
-			uncompress((void*)df->data_ptrs[index], &s, temp, datasize);
+			uncompress((Bytef*)df->data_ptrs[index], &s, (Bytef*)temp, datasize);
 			
 			/* clean up the temporary buffers */
 			mem_free(temp);
@@ -361,7 +361,7 @@ struct DATAFILE_OUT_t
 DATAFILE_OUT *datafile_create(const char *filename)
 {
 	int i;
-	DATAFILE_OUT *df = mem_alloc(sizeof(DATAFILE_OUT), 1);
+	DATAFILE_OUT *df = (DATAFILE_OUT*)mem_alloc(sizeof(DATAFILE_OUT), 1);
 	df->file = io_open(filename, IOFLAG_WRITE);
 	if(!df->file)
 	{
@@ -426,7 +426,7 @@ int datafile_add_data(DATAFILE_OUT *df, int size, void *data)
 	void *compdata = mem_alloc(size, 1); /* temporary buffer that we use duing compression */
 	info->uncompressed_size = size;
 	unsigned long s = size;
-	if(compress(compdata, &s, data, size) != Z_OK)
+	if(compress((Bytef*)compdata, &s, (Bytef*)data, size) != Z_OK)
 		dbg_assert(0, "zlib error");
 	info->compressed_size = (int)s;
 	info->compressed_data = mem_alloc(info->compressed_size, 1);
diff --git a/src/engine/external/pnglite/pnglite.c b/src/engine/external/pnglite/pnglite.c
index b33f60ba..f1af9e47 100644
--- a/src/engine/external/pnglite/pnglite.c
+++ b/src/engine/external/pnglite/pnglite.c
@@ -5,7 +5,7 @@
 #define USE_ZLIB 1

 

 #if USE_ZLIB

-#include <zlib.h>

+#include "../zlib/zlib.h"

 #else

 #include "zlite.h"

 #endif

diff --git a/src/engine/memheap.c b/src/engine/memheap.c
index 5fe30295..0188634f 100644
--- a/src/engine/memheap.c
+++ b/src/engine/memheap.c
@@ -23,7 +23,7 @@ static CHUNK *memheap_newchunk()
 	char *mem;
 	
 	/* allocate memory */
-	mem = mem_alloc(sizeof(CHUNK)+chunksize, 1);
+	mem = (char*)mem_alloc(sizeof(CHUNK)+chunksize, 1);
 	if(!mem)
 		return 0x0;
 
diff --git a/src/engine/system.c b/src/engine/system.c
index 45c648ab..8717d58a 100644
--- a/src/engine/system.c
+++ b/src/engine/system.c
@@ -360,7 +360,7 @@ NETSOCKET net_udp4_create(NETADDR4 bindaddr)
 #endif
 
 	/* set boardcast */
-	setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast));
+	setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (const char*)&broadcast, sizeof(broadcast));
 	
 	/* return */
 	return sock;
@@ -372,7 +372,7 @@ int net_udp4_send(NETSOCKET sock, const NETADDR4 *addr, const void *data, int si
 	int d;
 	mem_zero(&sa, sizeof(sa));
 	netaddr4_to_sockaddr(addr, &sa);
-	d = sendto((int)sock, data, size, 0, &sa, sizeof(sa));
+	d = sendto((int)sock, (const char*)data, size, 0, &sa, sizeof(sa));
 	return d;
 }
 
@@ -381,7 +381,7 @@ int net_udp4_recv(NETSOCKET sock, NETADDR4 *addr, void *data, int maxsize)
 	struct sockaddr from;
 	int bytes;
 	socklen_t fromlen = sizeof(struct sockaddr);
-	bytes = recvfrom(sock, data, maxsize, 0, &from, &fromlen);
+	bytes = recvfrom(sock, (char*)data, maxsize, 0, &from, &fromlen);
 	if(bytes > 0)
 	{
 		sockaddr_to_netaddr4(&from, addr);
@@ -486,14 +486,14 @@ int net_tcp4_connect_non_blocking(NETSOCKET sock, const NETADDR4 *a)
 int net_tcp4_send(NETSOCKET sock, const void *data, int size)
 {
   int d;
-  d = send((int)sock, data, size, 0);
+  d = send((int)sock, (const char*)data, size, 0);
   return d;
 }
 
 int net_tcp4_recv(NETSOCKET sock, void *data, int maxsize)
 {
   int bytes;
-  bytes = recv((int)sock, data, maxsize, 0);
+  bytes = recv((int)sock, (char*)data, maxsize, 0);
   return bytes;
 }