diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index 896d8fa3d0..d20f80a915 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -616,7 +616,7 @@ static void rcheevos_server_error(const char* api_name, const char* message) MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR); } -static void rcheevos_server_disconnected() +static void rcheevos_server_disconnected(void) { CHEEVOS_LOG(RCHEEVOS_TAG "Unable to communicate with RetroAchievements server\n"); @@ -633,7 +633,7 @@ static void rcheevos_server_disconnected() #endif } -static void rcheevos_server_reconnected() +static void rcheevos_server_reconnected(void) { CHEEVOS_LOG(RCHEEVOS_TAG "All pending requests synced to RetroAchievements server\n"); @@ -731,7 +731,7 @@ int rcheevos_get_richpresence(char* s, size_t len) } } - return rc_client_get_rich_presence_message(rcheevos_locals.client, s, (size_t)len); + return (int)rc_client_get_rich_presence_message(rcheevos_locals.client, s, (size_t)len); } #else /* !HAVE_RC_CLIENT */ diff --git a/deps/dr/dr_flac.h b/deps/dr/dr_flac.h index b0aad35b43..568a4016e0 100644 --- a/deps/dr/dr_flac.h +++ b/deps/dr/dr_flac.h @@ -772,7 +772,7 @@ typedef drflac_int32 drflac_result; static drflac_bool32 drflac__gIsLZCNTSupported = DRFLAC_FALSE; #ifndef DRFLAC_NO_CPUID static drflac_bool32 drflac__gIsSSE42Supported = DRFLAC_FALSE; -static void drflac__init_cpu_caps() +static void drflac__init_cpu_caps(void) { int info[4] = {0}; diff --git a/deps/xdelta3/xdelta3.c b/deps/xdelta3/xdelta3.c index f8b4b82dfd..a4540acdf6 100644 --- a/deps/xdelta3/xdelta3.c +++ b/deps/xdelta3/xdelta3.c @@ -1079,7 +1079,7 @@ static uint32_t adler32 (uint32_t adler, const uint8_t *buf, usize_t len) { uint32_t s1 = adler & 0xffffU; uint32_t s2 = (adler >> 16) & 0xffffU; - int k; + usize_t k; while (len > 0) { diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c index d52885ae4f..5bca5940be 100644 --- a/gfx/drivers/gl2.c +++ b/gfx/drivers/gl2.c @@ -3426,9 +3426,6 @@ static bool gl2_frame(void *data, const void *frame, bool use_rgba = (video_info->video_st_flags & VIDEO_FLAG_USE_RGBA) ? true : false; bool statistics_show = video_info->statistics_show; bool msg_bgcolor_enable = video_info->msg_bgcolor_enable; -#ifndef EMSCRIPTEN - unsigned black_frame_insertion = video_info->black_frame_insertion; -#endif int bfi_light_frames; unsigned n; bool input_driver_nonblock_state = video_info->input_driver_nonblock_state; @@ -3442,10 +3439,6 @@ static bool gl2_frame(void *data, const void *frame, #endif #ifdef HAVE_GFX_WIDGETS bool widgets_active = video_info->widgets_active; -#endif -#ifndef EMSCRIPTEN - bool runloop_is_slowmotion = video_info->runloop_is_slowmotion; - bool runloop_is_paused = video_info->runloop_is_paused; #endif bool overlay_behind_menu = video_info->overlay_behind_menu; diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c index 3cb76f4105..812515efee 100644 --- a/gfx/drivers/gl3.c +++ b/gfx/drivers/gl3.c @@ -2503,12 +2503,9 @@ static bool gl3_frame(void *data, const void *frame, #if 0 bool msg_bgcolor_enable = video_info->msg_bgcolor_enable; #endif - unsigned black_frame_insertion = video_info->black_frame_insertion; int bfi_light_frames; unsigned n; unsigned hard_sync_frames = video_info->hard_sync_frames; - bool runloop_is_paused = video_info->runloop_is_paused; - bool runloop_is_slowmotion = video_info->runloop_is_slowmotion; bool input_driver_nonblock_state = video_info->input_driver_nonblock_state; #ifdef HAVE_MENU bool menu_is_alive = (video_info->menu_st_flags & MENU_ST_FLAG_ALIVE) ? true : false; diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c index 1c6d4a4bc1..3fd0431135 100644 --- a/gfx/gfx_thumbnail_path.c +++ b/gfx/gfx_thumbnail_path.c @@ -403,7 +403,6 @@ bool gfx_thumbnail_set_content_playlist( const char *core_name = NULL; const char *db_name = NULL; const struct playlist_entry *entry = NULL; - settings_t* settings = config_get_ptr(); if (!path_data) return false; diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index 39d70901e4..0d2808352e 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -1600,7 +1600,7 @@ void gfx_widgets_frame(void *data) /* AI Service overlay */ if (p_dispwidget->ai_service_overlay_state > 0) { - int text_length = strlen(p_dispwidget->ai_service_text); + size_t text_length = strlen(p_dispwidget->ai_service_text); gfx_display_set_alpha(p_dispwidget->pure_white, 1.0f); @@ -1638,7 +1638,7 @@ void gfx_widgets_frame(void *data) if (text_width > (video_width * 0.9f - padding * 2)) { - int text_half = text_length / 2; + size_t text_half = text_length / 2; char *extra_line = (char*)malloc(sizeof(char) * text_length); for (; text_half > 0; text_half--) { diff --git a/gfx/video_driver.c b/gfx/video_driver.c index a374bb0419..8629fea50c 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -4302,8 +4302,8 @@ void video_frame_rest(video_driver_state_t *video_st, retro_time_t frame_time_target = 1000000.0f / settings->floats.video_refresh_rate; retro_time_t frame_time = 0; static retro_time_t after_present = 0; - int sleep_max = frame_time_target / 1000 / 2; - int sleep = 0; + retro_time_t sleep_max = frame_time_target / 1000 / 2; + retro_time_t sleep = 0; int frame_time_near_req_count = ceil(settings->floats.video_refresh_rate / 2); static int frame_time_over_count = 0; static int frame_time_near_count = 0; diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h index 1126b9e819..d34cbdb622 100644 --- a/libretro-common/include/libretro.h +++ b/libretro-common/include/libretro.h @@ -3129,7 +3129,7 @@ typedef void (RETRO_CALLCONV *retro_netpacket_send_t)(int flags, const void* buf * This function is not guaranteed to be thread-safe and must be called during * retro_run or any of the netpacket callbacks passed with this interface. */ -typedef void (RETRO_CALLCONV *retro_netpacket_poll_receive_t)(); +typedef void (RETRO_CALLCONV *retro_netpacket_poll_receive_t)(void); /* Called by the frontend to signify that a multiplayer session has started. * If client_id is 0 the local player is the host of the session and at this diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index 31a35d84a2..6abb251ab0 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -8310,7 +8310,7 @@ static enum menu_action ozone_parse_menu_entry_action( { ozone->pending_cursor_in_sidebar = false; ozone->flags |= OZONE_FLAG_CURSOR_IN_SIDEBAR; - ozone_sidebar_goto(ozone, ozone->categories_selection_ptr); + ozone_sidebar_goto(ozone, (unsigned)ozone->categories_selection_ptr); } break; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index f35ff1544d..0fd3622e98 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1553,7 +1553,6 @@ static void xmb_selection_pointer_changed( if (i == selection) { unsigned depth = (unsigned)xmb_list_get_size(xmb, MENU_LIST_PLAIN); - unsigned xmb_system_tab = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr); /* Update entry index text */ if (xmb->entry_idx_enabled) @@ -2694,8 +2693,6 @@ static void xmb_populate_entries(void *data, settings_t *settings = config_get_ptr(); struct menu_state *menu_st = menu_state_get_ptr(); menu_list_t *menu_list = menu_st->entries.list; - bool menu_dynamic_wallpaper_enable = settings - ? settings->bools.menu_dynamic_wallpaper_enable : false; bool show_entry_idx = settings ? settings->bools.playlist_show_entry_idx : false; bool was_db_manager_list = false; @@ -4111,7 +4108,7 @@ static int xmb_draw_item( * change animation is still in progress while entering a menu */ if (list == &xmb->selection_buf_old) { - node->y = xmb_item_y(xmb, i, current); + node->y = xmb_item_y(xmb, (int)i, current); node->alpha = xmb->items_active_alpha; node->zoom = xmb->items_active_zoom; } @@ -6350,7 +6347,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) if (use_smooth_ticker) { - ticker_smooth.field_width = tmp_len; + ticker_smooth.field_width = (unsigned)tmp_len; ticker_smooth.src_str = title_truncated; ticker_smooth.dst_str = tmp; ticker_smooth.dst_str_len = sizeof(tmp); @@ -7414,9 +7411,6 @@ static void xmb_context_reset_internal(xmb_handle_t *xmb, if ( gfx_thumbnail_is_enabled(menu_st->thumbnail_path_data, GFX_THUMBNAIL_RIGHT) || gfx_thumbnail_is_enabled(menu_st->thumbnail_path_data, GFX_THUMBNAIL_LEFT)) { - unsigned depth = (unsigned)xmb_list_get_size(xmb, MENU_LIST_PLAIN); - unsigned xmb_system_tab = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr); - if ( xmb->is_playlist || xmb->is_db_manager_list || xmb->is_explore_list diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index c53b81f4e7..f7c01e8cd6 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -709,7 +709,7 @@ static void netplay_send_cmd_netpacket(netplay_t *netplay, size_t conn_i, const void* buf, size_t len, uint16_t client_id); static void RETRO_CALLCONV netplay_netpacket_send_cb(int flags, const void* buf, size_t len, uint16_t client_id); -static void RETRO_CALLCONV netplay_netpacket_poll_receive_cb(); +static void RETRO_CALLCONV netplay_netpacket_poll_receive_cb(void); /* * netplay_init_socket_buffer @@ -9555,7 +9555,7 @@ static void RETRO_CALLCONV netplay_netpacket_send_cb(int flags, } } -static void RETRO_CALLCONV netplay_netpacket_poll_receive_cb() +static void RETRO_CALLCONV netplay_netpacket_poll_receive_cb(void) { net_driver_state_t *net_st = &networking_driver_st; netplay_t *netplay = net_st->data; diff --git a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj index 4ca1941148..e3dfe40c82 100644 --- a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 0734BB242ADB7FEE00EBDCAD /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 073734A42A093A5700BF7397 /* JITSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A1F81727006CAE00DEAD2A /* JITSupport.m */; }; 073734A62A093ACA00BF7397 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 073734A52A093ACA00BF7397 /* AltKit */; }; + 076CA50D2B695C2C00840EA5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 076CA50C2B695C2C00840EA5 /* libz.tbd */; }; 0789FC302A07847E00D042B7 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0789FC2F2A07847E00D042B7 /* AltKit */; }; 07B7872D29E8FE8F0088B74F /* filters in Resources */ = {isa = PBXBuildFile; fileRef = 07B7872C29E8FE8F0088B74F /* filters */; }; 07F7FB022A2DA8B800037C04 /* filters in Resources */ = {isa = PBXBuildFile; fileRef = 07F7FB012A2DA8B800037C04 /* filters */; }; @@ -163,6 +164,7 @@ 070A88422A4E7AA9003161C0 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = tvOS/modules/libMoltenVK.dylib; sourceTree = ""; }; 0718BC5F2ABBA807001F2CBE /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS17.0.sdk/System/Library/Frameworks/Network.framework; sourceTree = DEVELOPER_DIR; }; + 076CA50C2B695C2C00840EA5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS17.2.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; 0789FC2E2A07845300D042B7 /* AltKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = AltKit; path = Frameworks/AltKit; sourceTree = ""; }; 07B7872C29E8FE8F0088B74F /* filters */ = {isa = PBXFileReference; lastKnownFileType = folder; path = filters; sourceTree = ""; }; 07F7FB012A2DA8B800037C04 /* filters */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = filters; path = iOS/filters; sourceTree = SOURCE_ROOT; }; @@ -484,6 +486,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 076CA50D2B695C2C00840EA5 /* libz.tbd in Frameworks */, 926C77F121FD26E800103EDE /* GameController.framework in Frameworks */, 926C77EF21FD263800103EDE /* AudioToolbox.framework in Frameworks */, 073734A62A093ACA00BF7397 /* AltKit in Frameworks */, @@ -1182,6 +1185,7 @@ 96AFAE2816C1D4EA009DE44C /* Frameworks */ = { isa = PBXGroup; children = ( + 076CA50C2B695C2C00840EA5 /* libz.tbd */, 0718BC5F2ABBA807001F2CBE /* Network.framework */, 070A88422A4E7AA9003161C0 /* OpenAL.framework */, 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */, @@ -2119,6 +2123,7 @@ "-DHAVE_NETPLAYDISCOVERY_NSNET", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", + "-DHAVE_NO_BUILTINZLIB", "-DHAVE_ONLINE_UPDATER", "-DHAVE_OPENGL", "-DHAVE_OPENGLES", @@ -2245,6 +2250,7 @@ "-DHAVE_NETPLAYDISCOVERY_NSNET", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", + "-DHAVE_NO_BUILTINZLIB", "-DHAVE_ONLINE_UPDATER", "-DHAVE_OPENGL", "-DHAVE_OPENGLES", diff --git a/retroarch.c b/retroarch.c index 413eb025a4..b9e9aa5f30 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3633,7 +3633,6 @@ bool command_event(enum event_command cmd, void *data) { bool load_dummy_core = data ? *(bool*)data : true; content_ctx_info_t content_info = {0}; - global_t *global = global_get_ptr(); video_driver_state_t *video_st = video_state_get_ptr(); rarch_system_info_t *sys_info = &runloop_st->system; uint8_t flags = content_get_flags(); diff --git a/tasks/task_translation.c b/tasks/task_translation.c index 3966077a12..5a9b37352f 100644 --- a/tasks/task_translation.c +++ b/tasks/task_translation.c @@ -568,14 +568,7 @@ static access_response_t* parse_response_json(http_transfer_data_t *data) { int key = -1; rjson_t* json = NULL; - char* image_data = NULL; - int image_size = 0; -#ifdef HAVE_AUDIOMIXER - void *sound_data = NULL; - int sound_size = 0; -#endif access_response_t *response = NULL; - bool empty = true; enum rjson_type type; if (!data || !data->data) @@ -675,7 +668,6 @@ static void translation_response_image_widget( { video_driver_state_t *video_st = video_state_get_ptr(); dispgfx_widget_t *p_dispwidget = dispwidget_get_ptr(); - access_state_t *access_st = access_state_get_ptr(); bool ai_res; bool gfx_widgets_paused = video_st->flags & VIDEO_FLAG_WIDGETS_PAUSED; @@ -1082,7 +1074,6 @@ static void translation_response_input(access_response_t *response) #ifdef HAVE_ACCESSIBILITY input_driver_state_t *input_st = input_state_get_ptr(); #endif - int length = strlen(response->input); char *token = strtok(response->input, ","); while (token) @@ -1355,7 +1346,9 @@ static bool translation_dupe_fail(access_frame_t *frame) */ static access_base64_t* translation_frame_encode(access_frame_t *frame) { +#ifndef HAVE_RPNG uint8_t header[54]; +#endif uint8_t *buffer = NULL; uint64_t bytes = 0; access_base64_t *encode = NULL;