diff options
| author | Thom Johansen <thomj@rockbox.org> | 2006-04-05 15:43:42 +0000 |
|---|---|---|
| committer | Thom Johansen <thomj@rockbox.org> | 2006-04-05 15:43:42 +0000 |
| commit | 63b3b0c024fd722b1f73c0368d67999ba756bf8a (patch) | |
| tree | 9afbc5d675d153d36a70228cb5f8693dca8c49cc /apps/plugins | |
| parent | 872797be0eed05ee2607af71f41eddfa7c171c35 (diff) | |
| download | rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.zip rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.tar.gz rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.tar.bz2 rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.tar.xz | |
Remove workaround for broken ARM memset.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9520 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/doom/z_zone.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/apps/plugins/doom/z_zone.c b/apps/plugins/doom/z_zone.c index cc3d11a..2ae5d73 100644 --- a/apps/plugins/doom/z_zone.c +++ b/apps/plugins/doom/z_zone.c @@ -630,25 +630,9 @@ void *(Z_Calloc)(size_t n1, size_t n2, int tag, void **user , const char *file, int line #endif ) -{ void* s; - - /* The ARM version of memset doesn't correctly return a pointer - to the memory address being set, so we have to do this the long - way... Revert this when the ARM memset is fixed. - - */ - -#if 1 - if (n1*=n2) { - s = (Z_Malloc)(n1,tag,user DA(file,line)); - memset(s, 0, n1); - return s; - } else { - return NULL; - } -#else - return (n1*=n2) ? memset((Z_Malloc)(n1, tag, user DA(file, line)), 0, n1) : NULL; -#endif +{ + return + (n1*=n2) ? memset((Z_Malloc)(n1, tag, user DA(file, line)), 0, n1) : NULL; } char *(Z_Strdup)(const char *s, int tag, void **user |