fix some warnings
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 11 Apr 2010 20:52:35 +0000 (20:52 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 11 Apr 2010 20:52:35 +0000 (20:52 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10075 d7cf8633-e32d-0410-b094-e92efae38249

fs.c
prvm_edict.c

diff --git a/fs.c b/fs.c
index 6058893..40f78f0 100644 (file)
--- 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))
index e227d61..730a2a9 100644 (file)
@@ -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++;
        }