From 339ca3303eb66470182114ab0afbac3a91aa71e9 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 11 Apr 2010 20:52:35 +0000 Subject: [PATCH] fix some warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10075 d7cf8633-e32d-0410-b094-e92efae38249 --- fs.c | 2 +- prvm_edict.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs.c b/fs.c index 6058893e..40f78f0a 100644 --- a/fs.c +++ b/fs.c @@ -1630,7 +1630,7 @@ void FS_Init_SelfPack (void) } else { - memcpy(&new_argv[0], &com_argv[0], sizeof(*com_argv) * com_argc); + memcpy((char *)(&new_argv[0]), &com_argv[0], sizeof(*com_argv) * com_argc); } p = buf; while(COM_ParseToken_Console(&p)) diff --git a/prvm_edict.c b/prvm_edict.c index e227d612..730a2a99 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -2974,11 +2974,11 @@ int PRVM_AllocString(size_t bufferlength, char **pointer) memcpy((char **)prog->knownstrings_origin, oldstrings_origin, prog->numknownstrings * sizeof(char *)); } if (oldstrings) - Mem_Free(oldstrings); + Mem_Free((char **)oldstrings); if (oldstrings_freeable) Mem_Free((unsigned char *)oldstrings_freeable); if (oldstrings_origin) - Mem_Free(oldstrings_origin); + Mem_Free((char **)oldstrings_origin); } prog->numknownstrings++; } -- 2.39.2