From: Dale Weiler Date: Fri, 8 Feb 2013 12:20:48 +0000 (+0000) Subject: Make it compile as C++ code AGAIN X-Git-Tag: before-library~129 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=945aba6e10dfec4ec987e918dcab27ed4a84138f;p=xonotic%2Fgmqcc.git Make it compile as C++ code AGAIN --- diff --git a/pak.c b/pak.c index 35963ea..29e028c 100644 --- a/pak.c +++ b/pak.c @@ -92,8 +92,8 @@ static void pak_tree_build(const char *entry) { size_t itr; size_t jtr; - pathsplit = mem_a(56); - directory = mem_a(56); + pathsplit = (char *)mem_a(56); + directory = (char *)mem_a(56); memset(pathsplit, 0, 56); memset(directory, 0, 56); @@ -132,7 +132,7 @@ static pak_file_t *pak_open_read(const char *file) { pak_file_t *pak; size_t itr; - if (!(pak = mem_a(sizeof(pak_file_t)))) + if (!(pak = (pak_file_t*)mem_a(sizeof(pak_file_t)))) return NULL; if (!(pak->handle = fs_file_open(file, "rb"))) { @@ -181,7 +181,7 @@ static pak_file_t *pak_open_read(const char *file) { static pak_file_t *pak_open_write(const char *file) { pak_file_t *pak; - if (!(pak = mem_a(sizeof(pak_file_t)))) + if (!(pak = (pak_file_t*)mem_a(sizeof(pak_file_t)))) return NULL; /*