all repos — mgba @ 38187bac7a5f1fca58f82f64af06881e1999dc68

mGBA Game Boy Advance Emulator

Rename crc32 to doCrc32 to avoid symbol naming conflicts
Jeffrey Pfau jeffrey@endrift.com
Wed, 15 Oct 2014 01:41:50 -0700
commit

38187bac7a5f1fca58f82f64af06881e1999dc68

parent

24c826e5b109faff843179c3ee41fc8a5f21eb2b

4 files changed, 4 insertions(+), 4 deletions(-)

jump to
M src/gba/gba.csrc/gba/gba.c

@@ -403,7 +403,7 @@ gba->pristineRom = vf->map(vf, SIZE_CART0, MAP_READ);

gba->memory.rom = gba->pristineRom; gba->activeFile = fname; gba->memory.romSize = gba->pristineRomSize; - gba->romCrc32 = crc32(gba->memory.rom, gba->memory.romSize); + gba->romCrc32 = doCrc32(gba->memory.rom, gba->memory.romSize); GBASavedataInit(&gba->memory.savedata, sav); GBAGPIOInit(&gba->memory.gpio, &((uint16_t*) gba->memory.rom)[GPIO_REG_DATA >> 1]); _checkOverrides(gba, ((struct GBACartridge*) gba->memory.rom)->id);
M src/util/crc32.csrc/util/crc32.c

@@ -94,7 +94,7 @@ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,

0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -uint32_t crc32(const void* buf, size_t size) { +uint32_t doCrc32(const void* buf, size_t size) { return updateCrc32(0, buf, size); }
M src/util/crc32.hsrc/util/crc32.h

@@ -5,7 +5,7 @@ #include "util/common.h"

struct VFile; -uint32_t crc32(const void* buf, size_t size); +uint32_t doCrc32(const void* buf, size_t size); uint32_t updateCrc32(uint32_t crc, const void* buf, size_t size); uint32_t fileCrc32(struct VFile* file, size_t endOffset);
M src/util/patch-ups.csrc/util/patch-ups.c

@@ -90,7 +90,7 @@ return false;

} patch->vf->seek(patch->vf, 0, SEEK_SET); - if (crc32(out, outSize) != goodCrc32) { + if (doCrc32(out, outSize) != goodCrc32) { return false; } return true;