diff options
| author | Choupom <andycootlapin@hotmail.fr> | 2011-04-18 18:42:31 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-05-03 18:44:46 +0200 |
| commit | f1df704d78f1210b7832cb1fee8d767b296898e9 (patch) | |
| tree | 57d3d8553c959b010ee9cbbe977e2f16ff6fe195 | |
| parent | bbd7a75849c53b467a754d28caa76af31fabc08e (diff) | |
| download | zcatch-f1df704d78f1210b7832cb1fee8d767b296898e9.tar.gz zcatch-f1df704d78f1210b7832cb1fee8d767b296898e9.zip | |
fixed pnglite requiring a std header include
| -rw-r--r-- | src/engine/external/pnglite/pnglite.c | 2 | ||||
| -rw-r--r-- | src/engine/external/pnglite/pnglite.h | 2 | ||||
| -rw-r--r-- | src/tools/tileset_borderfix.cpp | 1 |
3 files changed, 2 insertions, 3 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 { diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp index b5eef77a..6fb32d4b 100644 --- a/src/tools/tileset_borderfix.cpp +++ b/src/tools/tileset_borderfix.cpp @@ -1,6 +1,5 @@ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ /* If you are missing that file, acquire a complete release at teeworlds.com. */ -#include <stdlib.h> #include <base/system.h> #include <engine/external/pnglite/pnglite.h> |