diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
| commit | f26581dc7e85f77393143a44c0c3eb3eef0da8b4 (patch) | |
| tree | 9a83c5eaf1abe2cc61b216012f997e6891840a19 /demos/3rdparty | |
| parent | b6daaabf32bf2092689e0732ca4486f25e80317f (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.gz uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.bz2 uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/3rdparty')
| -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; } |