devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove workaround for broken ARM memset.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9520 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2006-04-05 15:43:42 +00:00
parent 872797be0e
commit 63b3b0c024
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/plugins/doom/z_zone.c
View file

@ -630,25 +630,9 @@ void *(Z_Calloc)(size_t n1, size_t n2, int tag, void **user
, const char *file, int line , const char *file, int line
#endif #endif
) )
{ void* s; {
return
/* The ARM version of memset doesn't correctly return a pointer (n1*=n2) ? memset((Z_Malloc)(n1, tag, user DA(file, line)), 0, n1) : NULL;
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
} }
char *(Z_Strdup)(const char *s, int tag, void **user char *(Z_Strdup)(const char *s, int tag, void **user