diff options
author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
commit | e178b08549bd0bf3e2a8d235518a60ea05681962 (patch) | |
tree | 58091e888e7712a659f21e04258c6a49eca22442 /demos/3rdparty/doom/i_system.c | |
parent | 3c99e6e67dfa9833e25ebd417ccbd45a2d4493f6 (diff) | |
parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
download | uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.gz uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.bz2 uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.zip |
Merge branch 'master' into gwin
Diffstat (limited to 'demos/3rdparty/doom/i_system.c')
-rw-r--r-- | demos/3rdparty/doom/i_system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/3rdparty/doom/i_system.c b/demos/3rdparty/doom/i_system.c index 094144f6..aa1d7481 100644 --- a/demos/3rdparty/doom/i_system.c +++ b/demos/3rdparty/doom/i_system.c @@ -66,7 +66,7 @@ int I_GetHeapSize (void) byte* I_ZoneBase (int* size) { *size = mb_used*1024*1024; - return (byte *) gfxAlloc (*size); + return gfxAlloc (*size); } @@ -124,7 +124,7 @@ byte* I_Malloc(int length) { byte* mem; - mem = (byte *)gfxAlloc (length); + mem = gfxAlloc (length); memset (mem,0,length); return mem; } |