Mercurial > hg > old > magoroku_racing.bad

comparison ps2util.cc @ 139:00d7de7fe9df default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix collision
author Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp>
date Thu, 21 Jul 2011 22:49:57 +0900
parents 2cc2796b3681
children
comparison
equal deleted inserted replaced
138:a32551423d64 139:00d7de7fe9df
346 cerium にある。 346 cerium にある。
347 */ 347 */
348 int malloc_align16(void *free, void *aligned, int size) 348 int malloc_align16(void *free, void *aligned, int size)
349 { 349 {
350 char *index; 350 char *index;
351 unsigned int *f=(unsigned int *)free, *a=(unsigned int *)aligned; 351 unsigned long *f=(unsigned long *)free, *a=(unsigned long *)aligned;
352 352
353 if (free == NULL || aligned == NULL || size <= 0) return(-1); 353 if (free == NULL || aligned == NULL || size <= 0) return(-1);
354 354
355 index = (char *)malloc(size + ALIGN_16BYTE); 355 index = (char *)malloc(size + ALIGN_16BYTE);
356 if (index == NULL) { 356 if (index == NULL) {