- Fixed: Removing malloc.h for every system because FreeBSD doesn't like

it is wrong.


SVN r1525 (trunk)
This commit is contained in:
Randy Heit 2009-04-08 04:14:37 +00:00
parent a908834a11
commit cc9efce818
2 changed files with 7 additions and 2 deletions

View file

@ -894,7 +894,7 @@ static int PatchThing (int thingy)
// don't specify a new height. // don't specify a new height.
if (info->flags & MF_SPAWNCEILING && if (info->flags & MF_SPAWNCEILING &&
!hadHeight && !hadHeight &&
thingy <= OrgHeights.Size() && thingy > 0) thingy <= (int)OrgHeights.Size() && thingy > 0)
{ {
info->height = OrgHeights[thingy - 1] * FRACUNIT; info->height = OrgHeights[thingy - 1] * FRACUNIT;
info->projectilepassheight = 0; info->projectilepassheight = 0;
@ -1069,7 +1069,7 @@ static int PatchFrame (int frameNum)
{ {
unsigned int i; unsigned int i;
if (val < OrgSprNames.Size()) if (val < (int)OrgSprNames.Size())
{ {
for (i = 0; i < sprites.Size(); i++) for (i = 0; i < sprites.Size(); i++)
{ {

View file

@ -32,7 +32,12 @@
** **
*/ */
#ifdef __FreeBSD__
#include <stdlib.h> #include <stdlib.h>
#include <malloc_np.h>
#else
#include <malloc.h>
#endif
#include "i_system.h" #include "i_system.h"
#include "dobject.h" #include "dobject.h"