From adb2274fc683f8cce8036f804bda90170b732563 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 29 Mar 2018 17:55:06 +0200 Subject: [PATCH] - Enable HAVE_RUNAHEAD for MSVC 2003 - Remove some unreferenced labels --- pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj | 8 ++++---- runahead/copy_load_info.c | 8 ++++---- runahead/run_ahead.c | 2 +- runahead/secondary_core.c | 7 ++----- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index 443c10edce..3bcfe59ddf 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\..\..\deps";"$(SolutionDir)\..\..\deps\stb";"$(SolutionDir)\..\..\gfx\include"" - PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" + PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -70,7 +70,7 @@ size; i++) { @@ -49,10 +49,10 @@ static void free_string_list(struct string_list *dest) static struct string_list* clone_string_list(const struct string_list *src) { - int i; + unsigned i; struct string_list *dest = NULL; - if (src == NULL) + if (!src) return NULL; dest = (struct string_list*)malloc_zero(sizeof(struct string_list)); diff --git a/runahead/run_ahead.c b/runahead/run_ahead.c index e5171ca52c..fbc7601af8 100644 --- a/runahead/run_ahead.c +++ b/runahead/run_ahead.c @@ -273,7 +273,7 @@ void run_ahead(int runAheadCount, bool useSecondary) if (!runahead_load_state_secondary()) return; - for (frame_count = 0; frame_count < runAheadCount - 1; frame_count++) + for (frame_count = 0; frame_count < (unsigned)(runAheadCount - 1); frame_count++) { runahead_suspend_video(); runahead_suspend_audio(); diff --git a/runahead/secondary_core.c b/runahead/secondary_core.c index cce380eca8..c62ee99845 100644 --- a/runahead/secondary_core.c +++ b/runahead/secondary_core.c @@ -130,7 +130,7 @@ char* copy_core_to_temp_file(void) if (!okay) goto failed; } -success: + free_str(&tempDirectory); free_str(&retroarchTempPath); free_ptr(&dllFileData); @@ -181,12 +181,9 @@ bool write_file_with_random_name(char **tempDllPath, if (okay) break; } -success: + free_str(&ext); return true; -failed: - free_str(&ext); - return false; } void secondary_core_clear(void)