about summary refs log tree commit diff
path: root/src/engine
diff options
context:
space:
mode:
authorChoupom <andycootlapin@hotmail.fr>2011-04-18 18:42:31 +0200
committeroy <Tom_Adams@web.de>2011-05-03 18:44:46 +0200
commitf1df704d78f1210b7832cb1fee8d767b296898e9 (patch)
tree57d3d8553c959b010ee9cbbe977e2f16ff6fe195 /src/engine
parentbbd7a75849c53b467a754d28caa76af31fabc08e (diff)
downloadzcatch-f1df704d78f1210b7832cb1fee8d767b296898e9.tar.gz
zcatch-f1df704d78f1210b7832cb1fee8d767b296898e9.zip
fixed pnglite requiring a std header include
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/external/pnglite/pnglite.c2
-rw-r--r--src/engine/external/pnglite/pnglite.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/external/pnglite/pnglite.c b/src/engine/external/pnglite/pnglite.c
index 583a4c5f..76bb077d 100644
--- a/src/engine/external/pnglite/pnglite.c
+++ b/src/engine/external/pnglite/pnglite.c
@@ -113,7 +113,7 @@ int png_init(png_alloc_t pngalloc, png_free_t pngfree)
 	if(pngalloc)

 		png_alloc = pngalloc;

 	else

-		png_alloc = &malloc;

+		png_alloc = &(png_alloc_t)malloc;

 

 	if(pngfree)

 		png_free = pngfree;

diff --git a/src/engine/external/pnglite/pnglite.h b/src/engine/external/pnglite/pnglite.h
index eae3d4ce..72ff1c52 100644
--- a/src/engine/external/pnglite/pnglite.h
+++ b/src/engine/external/pnglite/pnglite.h
@@ -73,7 +73,7 @@ enum
 typedef unsigned (*png_write_callback_t)(void* input, unsigned long size, unsigned long numel, void* user_pointer);

 typedef unsigned (*png_read_callback_t)(void* output, unsigned long size, unsigned long numel, void* user_pointer);

 typedef void (*png_free_t)(void* p);

-typedef void * (*png_alloc_t)(size_t s);

+typedef void * (*png_alloc_t)(unsigned long s);

 

 typedef struct

 {