about summary refs log tree commit diff
path: root/src/engine/datafile.c
diff options
context:
space:
mode:
authorJoel de Vahl <joel@stalverk80.se>2007-10-02 14:14:58 +0000
committerJoel de Vahl <joel@stalverk80.se>2007-10-02 14:14:58 +0000
commit4bf60da04b668d10c53d5d3784ba3543c7a4d314 (patch)
treebb15deb530e6094908f9b706d6b20ab9be23f086 /src/engine/datafile.c
parent0ee7affeb1fd64f1dbb9c9596143f25514be9a8c (diff)
downloadzcatch-4bf60da04b668d10c53d5d3784ba3543c7a4d314.tar.gz
zcatch-4bf60da04b668d10c53d5d3784ba3543c7a4d314.zip
random win32 fixes
Diffstat (limited to 'src/engine/datafile.c')
-rw-r--r--src/engine/datafile.c8
1 files changed, 4 insertions, 4 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);