From 3385be2578f930daf329afc3235833b62bda5b6c Mon Sep 17 00:00:00 2001 From: retro-wertz Date: Thu, 14 Jun 2018 23:06:11 +0800 Subject: [PATCH] Silence some warnings --- src/apu/Gb_Oscs.h | 2 +- src/common/ConfigManager.h | 2 +- src/libretro/UtilRetro.cpp | 4 ++-- src/libretro/libretro.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/apu/Gb_Oscs.h b/src/apu/Gb_Oscs.h index 3cf3812a..700f28f1 100644 --- a/src/apu/Gb_Oscs.h +++ b/src/apu/Gb_Oscs.h @@ -57,9 +57,9 @@ class Gb_Env : public Gb_Osc Gb_Env() : env_enabled(false), env_delay(0) { } + bool env_enabled; int env_delay; int volume; - bool env_enabled; void clock_envelope(); bool write_register(int frame_phase, int reg, int old_data, int data); diff --git a/src/common/ConfigManager.h b/src/common/ConfigManager.h index e6a10082..20fca14b 100644 --- a/src/common/ConfigManager.h +++ b/src/common/ConfigManager.h @@ -145,7 +145,7 @@ extern const char *preparedCheatCodes[MAX_CHEATS]; // allow up to 100 IPS/UPS/PPF patches given on commandline #define PATCH_MAX_NUM 100 extern int patchNum; -extern char *(patchNames[PATCH_MAX_NUM]); // and so on +extern char *patchNames[PATCH_MAX_NUM]; // and so on extern int mouseCounter; diff --git a/src/libretro/UtilRetro.cpp b/src/libretro/UtilRetro.cpp index f2e13e71..808e0b7c 100644 --- a/src/libretro/UtilRetro.cpp +++ b/src/libretro/UtilRetro.cpp @@ -137,7 +137,7 @@ static bool utilIsImage(const char* file) IMAGE_TYPE utilFindType(const char* file) { - char buffer[2048]; + //char buffer[2048]; if (!utilIsImage(file)) // TODO: utilIsArchive() instead? { return IMAGE_UNKNOWN; @@ -156,7 +156,7 @@ static int utilGetSize(int size) uint8_t *utilLoad(const char *file, bool (*accept)(const char *), uint8_t *data, int &size) { FILE *fp = NULL; - char *buf = NULL; + //char *buf = NULL; fp = fopen(file,"rb"); if(!fp) return NULL; diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp index 72a1f39a..b3fa4db9 100644 --- a/src/libretro/libretro.cpp +++ b/src/libretro/libretro.cpp @@ -587,7 +587,7 @@ static void update_variables(void) layerEnable = DISPCNT & layerSettings; CPUUpdateRenderBuffers(false); - unsigned sound_enabled = 0x30F; + int sound_enabled = 0x30F; strcpy(key, "vbam_sound_x"); for (unsigned i = 0; i < 6; i++) {