diff --git a/cores/libretro-net-retropad/net_retropad_core.c b/cores/libretro-net-retropad/net_retropad_core.c index f86ea8eb83..e9580ba7c5 100644 --- a/cores/libretro-net-retropad/net_retropad_core.c +++ b/cores/libretro-net-retropad/net_retropad_core.c @@ -581,7 +581,7 @@ static void retropad_update_input(void) } } -static void open_UDP_socket() +static void netretropad_open_udp_socket(void) { socket_target_t in_target; @@ -702,7 +702,7 @@ void NETRETROPAD_CORE_PREFIX(retro_set_video_refresh)(retro_video_refresh_t cb) void NETRETROPAD_CORE_PREFIX(retro_reset)(void) { netretropad_check_variables(); - open_UDP_socket(); + netretropad_open_udp_socket(); } void NETRETROPAD_CORE_PREFIX(retro_run)(void) @@ -985,7 +985,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void) bool NETRETROPAD_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info) { netretropad_check_variables(); - open_UDP_socket(); + netretropad_open_udp_socket(); /* If a .ratst file is given (only possible via command line), * initialize test sequence. */ diff --git a/deps/glslang/glslang/glslang/Include/PoolAlloc.h b/deps/glslang/glslang/glslang/Include/PoolAlloc.h index 9232213f97..39f5dccc0a 100644 --- a/deps/glslang/glslang/glslang/Include/PoolAlloc.h +++ b/deps/glslang/glslang/glslang/Include/PoolAlloc.h @@ -63,22 +63,6 @@ namespace glslang { -// If we are using guard blocks, we must track each individual -// allocation. If we aren't using guard blocks, these -// never get instantiated, so won't have any impact. -// - -class TAllocation { -public: - TAllocation(size_t size, unsigned char* mem, TAllocation* prev = 0) : - size(size), mem(mem), prevAlloc(prev) { } - -private: - size_t size; // size of the user data area - unsigned char* mem; // beginning of our allocation (pts to header) - TAllocation* prevAlloc; // prior allocation in the chain -}; - // // There are several stacks. One is to track the pushing and popping // of the user, and not yet implemented. The others are simply a diff --git a/deps/mbedtls/bignum.c b/deps/mbedtls/bignum.c index 9913c33499..aa98e21047 100644 --- a/deps/mbedtls/bignum.c +++ b/deps/mbedtls/bignum.c @@ -1101,7 +1101,7 @@ __attribute__ ((noinline)) #endif void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) { - mbedtls_mpi_uint c = 0, t = 0; + mbedtls_mpi_uint c = 0; #if defined(MULADDC_HUIT) for( ; i >= 8; i -= 8 ) diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index cd1737ac6e..865f1aebe9 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -8108,7 +8108,7 @@ static enum menu_action ozone_parse_menu_entry_action( if ( !menu_navigation_wraparound_enable && selection == ozone->system_tab_end + horizontal_list_size) - new_selection = selection; + new_selection = (int)selection; if (new_selection != (int)selection) {