diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp index 0e9ae712fe..8624436daf 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp @@ -178,7 +178,7 @@ bool ReadAnnotatedAssembly(const char *filename) // Scan for function starts if (!memcmp(line, "void", 4)) { char temp[256]; - for (int i = 6; i < len; i++) { + for (size_t i = 6; i < len; i++) { if (line[i] == '(') { // Yep, got one. memcpy(temp, line + 5, i - 5); @@ -197,7 +197,7 @@ bool ReadAnnotatedAssembly(const char *filename) } // Scan for braces - for (int i = 0; i < (int)len; i++) { + for (size_t i = 0; i < len; i++) { if (line[i] == '{') brace_count++; if (line[i] == '}') diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 9547fda125..1c5a564778 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -123,7 +123,7 @@ bool Renderer::Init() sscanf(g_Config.cFSResolution, "%dx%d", &w_temp, &h_temp); - for (fullScreenRes = 0; fullScreenRes < D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size(); fullScreenRes++) + for (fullScreenRes = 0; fullScreenRes < (int)D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size(); fullScreenRes++) { if ((D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].xres == w_temp) && (D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].yres == h_temp)) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/resource.h b/Source/Plugins/Plugin_VideoDX9/Src/resource.h index d8ccc10252..ef7fb34e98 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/resource.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/resource.h @@ -1534,11 +1534,8 @@ #define SC_CONTEXTHELP 0xF180 #define LVS_TYPESTYLEMASK 0xfc00 #define SPVERSION_MASK 0x0000FF00 -#define HTERROR -2 #define IDC_STATIC -1 #define UNICODE_NOCHAR 0xFFFF -#define PWR_FAIL -1 -#define HTTRANSPARENT -1 // Next default values for new objects // diff --git a/Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp index ac277d44a2..5c3fc856d3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp @@ -406,7 +406,7 @@ bool CompileAndRunDisplayList(u32 address, int size, CachedDisplayList *dl) emitter.MOV(64, R(RAX), Imm64(pre_draw_video_data)); emitter.MOV(64, M(&g_pVideoData), R(RAX)); #else - emitter.MOV(32, R(EAX), Imm32(pre_draw_video_data)); + emitter.MOV(32, R(EAX), Imm32((u32)pre_draw_video_data)); emitter.MOV(32, M(&g_pVideoData), R(EAX)); #endif emitter.ABI_CallFunctionCCC(