diff --git a/include/mgba-util/common.h b/include/mgba-util/common.h index 52a040198..746e57799 100644 --- a/include/mgba-util/common.h +++ b/include/mgba-util/common.h @@ -17,6 +17,9 @@ CXX_GUARD_START #ifdef _WIN32 +#ifdef _CRT_NONSTDC_NO_WARNINGS +#define _CRT_NONSTDC_NO_WARNINGS +#endif #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/src/core/input.c b/src/core/input.c index 1c06d48a9..3232d64d9 100644 --- a/src/core/input.c +++ b/src/core/input.c @@ -650,7 +650,7 @@ void mInputSetPreferredDevice(struct Configuration* config, const char* platform char deviceId[KEY_NAME_MAX]; snprintf(deviceId, sizeof(deviceId), "device%i", playerId); - return ConfigurationSetValue(config, sectionName, deviceId, deviceName); + ConfigurationSetValue(config, sectionName, deviceId, deviceName); } const char* mInputGetCustomValue(const struct Configuration* config, const char* platformName, uint32_t type, const char* key, const char* profile) { diff --git a/src/core/scripting.c b/src/core/scripting.c index c87829f75..60e1671d0 100644 --- a/src/core/scripting.c +++ b/src/core/scripting.c @@ -1346,9 +1346,9 @@ static uint8_t _readLuminance(struct GBALuminanceSource* luminance) { } #endif -#define CALLBACK(NAME) _mScriptCoreCallback ## NAME +#define mCoreCallback(NAME) _mScriptCoreCallback ## NAME #define DEFINE_CALLBACK(NAME) \ - void CALLBACK(NAME) (void* context) { \ + void mCoreCallback(NAME) (void* context) { \ struct mScriptContext* scriptContext = context; \ if (!scriptContext) { \ return; \ @@ -1397,13 +1397,13 @@ void mScriptContextAttachCore(struct mScriptContext* context, struct mCore* core #endif struct mCoreCallbacks callbacks = { - .videoFrameEnded = CALLBACK(frame), - .coreCrashed = CALLBACK(crashed), - .sleep = CALLBACK(sleep), - .shutdown = CALLBACK(stop), - .keysRead = CALLBACK(keysRead), - .savedataUpdated = CALLBACK(savedataUpdated), - .alarm = CALLBACK(alarm), + .videoFrameEnded = mCoreCallback(frame), + .coreCrashed = mCoreCallback(crashed), + .sleep = mCoreCallback(sleep), + .shutdown = mCoreCallback(stop), + .keysRead = mCoreCallback(keysRead), + .savedataUpdated = mCoreCallback(savedataUpdated), + .alarm = mCoreCallback(alarm), .context = context }; core->addCoreCallbacks(core, &callbacks); diff --git a/src/core/test/scripting.c b/src/core/test/scripting.c index 16692fc14..bea6242ec 100644 --- a/src/core/test/scripting.c +++ b/src/core/test/scripting.c @@ -58,6 +58,7 @@ static const uint8_t _fakeGBROM[0x4000] = { assert_true(core->loadROM(core, VFileFromConstMemory(_fakeGBROM, sizeof(_fakeGBROM)))); \ break; \ case mPLATFORM_NONE: \ + abort(); \ break; \ } \ mCoreInitConfig(core, NULL); \ @@ -345,6 +346,9 @@ void _setupBp(struct mCore* core) { core->rawWrite8(core, 0xF2, 0, 0xFD); // jr $-3 break; #endif + case mPLATFORM_NONE: + abort(); + break; } }