From a47c4db5e5e3b50db9bf8fd0987241befe50417b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 23 Jul 2014 07:17:31 +0200 Subject: [PATCH] Backport Lioncash - Fix some compile warnings realted to casting --- gfx/shader_glsl.c | 4 ++-- input/winxinput_joypad.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index 3a2bf9ebd1..5033339500 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -371,7 +371,7 @@ static GLuint compile_program(const char *vertex, const char *fragment, unsigned if (!compile_shader(vert, "#define VERTEX\n#define PARAMETER_UNIFORM\n", vertex)) { RARCH_ERR("Failed to compile vertex shader #%u\n", i); - return false; + return 0; } glAttachShader(prog, vert); @@ -384,7 +384,7 @@ static GLuint compile_program(const char *vertex, const char *fragment, unsigned if (!compile_shader(frag, "#define FRAGMENT\n#define PARAMETER_UNIFORM\n", fragment)) { RARCH_ERR("Failed to compile fragment shader #%u\n", i); - return false; + return 0; } glAttachShader(prog, frag); diff --git a/input/winxinput_joypad.c b/input/winxinput_joypad.c index 82a3c9672f..83ad17a5d2 100644 --- a/input/winxinput_joypad.c +++ b/input/winxinput_joypad.c @@ -330,7 +330,7 @@ static int16_t winxinput_joypad_axis (unsigned port_num, uint32_t joyaxis) return dinput_joypad.axis(port_num, joyaxis); if (!(g_winxinput_states[xplayer].connected)) - return false; + return 0; int16_t val = 0; int axis = -1;