From 9ad88b9c110bfe14de383f2f265c864fbaa749fc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 21 Feb 2018 14:46:01 +0100 Subject: [PATCH] Fix warnings --- Makefile.libretro | 5 +++++ src/boards/57.c | 2 +- src/boards/90.c | 2 +- src/boards/__dummy_mapper.c | 2 +- src/boards/datalatch.c | 10 +++++----- src/boards/mmc5.c | 4 ++-- src/boards/sachen.c | 8 ++++---- src/boards/unrom512.c | 4 ++-- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 58a087f..0156318 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -51,7 +51,12 @@ GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" ifneq ($(GIT_VERSION)," unknown") CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif + +ifneq (,$(findstring msvc,$(platform))) +LIBM := +else LIBM := -lm +endif LIBS := # Unix diff --git a/src/boards/57.c b/src/boards/57.c index 2cd41c0..278b196 100644 --- a/src/boards/57.c +++ b/src/boards/57.c @@ -62,7 +62,7 @@ static void M57Power(void) { Sync(); } -static void M57Reset() { +static void M57Reset(void) { hrd_flag++; hrd_flag &= 3; FCEU_printf("Select Register = %02x\n", hrd_flag); diff --git a/src/boards/90.c b/src/boards/90.c index 1d401f6..bdbd3a0 100644 --- a/src/boards/90.c +++ b/src/boards/90.c @@ -396,7 +396,7 @@ static void FP_FASTAPASS(1) M90PPU(uint32 A) { } } -static void togglie() { +static void togglie(void) { tekker += 0x40; tekker &= 0xC0; FCEU_printf("tekker=%02x\n", tekker); diff --git a/src/boards/__dummy_mapper.c b/src/boards/__dummy_mapper.c index 3443486..0e257eb 100644 --- a/src/boards/__dummy_mapper.c +++ b/src/boards/__dummy_mapper.c @@ -65,7 +65,7 @@ static void MNNNClose(void) { } */ -static void MNNNIRQHook() { +static void MNNNIRQHook(void) { X6502_IRQBegin(FCEU_IQEXT); } diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c index 6ad608e..3ed37be 100644 --- a/src/boards/datalatch.c +++ b/src/boards/datalatch.c @@ -176,7 +176,7 @@ void CNROM_Init(CartInfo *info) { /*------------------ Map 7 ---------------------------*/ -static void ANROMSync() { +static void ANROMSync(void) { setprg32(0x8000, latche & 0xF); setmirror(MI_0 + ((latche >> 4) & 1)); setchr8(0); @@ -188,7 +188,7 @@ void ANROM_Init(CartInfo *info) { /*------------------ Map 8 ---------------------------*/ -static void M8Sync() { +static void M8Sync(void) { setprg16(0x8000, latche >> 3); setprg16(0xc000, 1); setchr8(latche & 3); @@ -249,7 +249,7 @@ void MHROM_Init(CartInfo *info) { /*------------------ Map 70 ---------------------------*/ -static void M70Sync() { +static void M70Sync(void) { setprg16(0x8000, latche >> 4); setprg16(0xc000, ~0); setchr8(latche & 0xf); @@ -261,7 +261,7 @@ void Mapper70_Init(CartInfo *info) { /*------------------ Map 78 ---------------------------*/ /* Should be two separate emulation functions for this "mapper". Sigh. URGE TO KILL RISING. */ -static void M78Sync() { +static void M78Sync(void) { setprg16(0x8000, (latche & 7)); setprg16(0xc000, ~0); setchr8(latche >> 4); @@ -392,7 +392,7 @@ void Mapper140_Init(CartInfo *info) { /*------------------ Map 152 ---------------------------*/ -static void M152Sync() { +static void M152Sync(void) { setprg16(0x8000, (latche >> 4) & 7); setprg16(0xc000, ~0); setchr8(latche & 0xf); diff --git a/src/boards/mmc5.c b/src/boards/mmc5.c index 2e0998c..27952c6 100644 --- a/src/boards/mmc5.c +++ b/src/boards/mmc5.c @@ -530,7 +530,7 @@ typedef struct { static MMC5APU MMC5Sound; -static void Do5PCM() { +static void Do5PCM(void) { int32 V; int32 start, end; @@ -544,7 +544,7 @@ static void Do5PCM() { Wave[V >> 4] += MMC5Sound.raw << 1; } -static void Do5PCMHQ() { +static void Do5PCMHQ(void) { uint32 V; if (!(MMC5Sound.rawcontrol & 0x40) && MMC5Sound.raw) for (V = MMC5Sound.BC[2]; V < SOUNDTS; V++) diff --git a/src/boards/sachen.c b/src/boards/sachen.c index b236db1..db5e63d 100644 --- a/src/boards/sachen.c +++ b/src/boards/sachen.c @@ -255,22 +255,22 @@ static void SADPower(void) { SetWriteHandler(0x8000, 0xFFFF, SADWrite); } -static void SA0161MSynco() { +static void SA0161MSynco(void) { setprg32(0x8000, (latch[0] >> 3) & 1); setchr8(latch[0] & 7); } -static void SA72007Synco() { +static void SA72007Synco(void) { setprg32(0x8000, 0); setchr8(latch[0] >> 7); } -static void SA009Synco() { +static void SA009Synco(void) { setprg32(0x8000, 0); setchr8(latch[0] & 1); } -static void SA72008Synco() { +static void SA72008Synco(void) { setprg32(0x8000, (latch[0] >> 2) & 1); setchr8(latch[0] & 3); } diff --git a/src/boards/unrom512.c b/src/boards/unrom512.c index d4df1a6..f82d7f9 100644 --- a/src/boards/unrom512.c +++ b/src/boards/unrom512.c @@ -148,7 +148,7 @@ static void UNROM512LatchPower(void) { static void UNROM512LatchClose(void) { } -static void UNROM512LSync() { +static void UNROM512LSync(void) { int erase_a[5] = { 0x9555, 0xAAAA, 0x9555, 0x9555, 0xAAAA }; int erase_d[5] = { 0xAA, 0x55, 0x80, 0xAA, 0x55 }; int erase_b[5] = { 1, 0, 1, 1, 0 }; @@ -198,7 +198,7 @@ static void UNROM512LSync() { } } -static void UNROM512HSync() { +static void UNROM512HSync(void) { flash_bank=latche&(ROM_size - 1); setprg16(0x8000, flash_bank);