From a2f7f962ced158dbceebbfc0c3dfbbc58b119e55 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 21 Jul 2024 18:33:01 -0400 Subject: Rename memswap() to swap_regions(). Consolidate duplicate implementations. C99 reserves the mem* namespace for future expansion. Some Rockbox targets had issues with memswap() conflicting with another definition, so fix that. --- misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index 6b5f3f8..f9eaf5d 100644 --- a/misc.c +++ b/misc.c @@ -294,7 +294,7 @@ void game_mkhighlight(frontend *fe, float *ret, game_mkhighlight_specific(fe, ret, background, highlight, lowlight); } -static void memswap(void *av, void *bv, int size) +void swap_regions(void *av, void *bv, size_t size) { char tmpbuf[512]; char *a = av, *b = bv; @@ -318,7 +318,7 @@ void shuffle(void *array, int nelts, int eltsize, random_state *rs) for (i = nelts; i-- > 1 ;) { int j = random_upto(rs, i+1); if (j != i) - memswap(carray + eltsize * i, carray + eltsize * j, eltsize); + swap_regions(carray + eltsize * i, carray + eltsize * j, eltsize); } } -- cgit v1.1