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 | |
| parent | 872797be0eed05ee2607af71f41eddfa7c171c35 (diff) | |
| download | rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.tar.gz rockbox-63b3b0c024fd722b1f73c0368d67999ba756bf8a.zip | |
Remove workaround for broken ARM memset.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9520 a1c6a512-1295-4272-9138-f99709370657
| -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 cc3d11abc4..2ae5d73833 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 | |||
| 630 | , const char *file, int line | 630 | , const char *file, int line |
| 631 | #endif | 631 | #endif |
| 632 | ) | 632 | ) |
| 633 | { void* s; | 633 | { |
| 634 | 634 | return | |
| 635 | /* The ARM version of memset doesn't correctly return a pointer | 635 | (n1*=n2) ? memset((Z_Malloc)(n1, tag, user DA(file, line)), 0, n1) : NULL; |
| 636 | to the memory address being set, so we have to do this the long | ||
| 637 | way... Revert this when the ARM memset is fixed. | ||
| 638 | |||
| 639 | */ | ||
| 640 | |||
| 641 | #if 1 | ||
| 642 | if (n1*=n2) { | ||
| 643 | s = (Z_Malloc)(n1,tag,user DA(file,line)); | ||
| 644 | memset(s, 0, n1); | ||
| 645 | return s; | ||
| 646 | } else { | ||
| 647 | return NULL; | ||
| 648 | } | ||
| 649 | #else | ||
| 650 | return (n1*=n2) ? memset((Z_Malloc)(n1, tag, user DA(file, line)), 0, n1) : NULL; | ||
| 651 | #endif | ||
| 652 | } | 636 | } |
| 653 | 637 | ||
| 654 | char *(Z_Strdup)(const char *s, int tag, void **user | 638 | char *(Z_Strdup)(const char *s, int tag, void **user |