]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Make it compile as C++ code AGAIN
authorDale Weiler <killfieldengine@gmail.com>
Fri, 8 Feb 2013 12:20:48 +0000 (12:20 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Fri, 8 Feb 2013 12:20:48 +0000 (12:20 +0000)
pak.c

diff --git a/pak.c b/pak.c
index 35963ea2e92c474c31c275b1c2cb31ced229fa9a..29e028c52e55cc4e7e632828b8800def609922f8 100644 (file)
--- 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;
 
     /*