From f319916e803817b3bc5f8df354dac1cc120b04ea Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 25 Nov 2015 03:33:54 +0100 Subject: [PATCH] C89_BUILD buildfixes --- command_event.c | 1 - libretro-common/net/net_http.c | 2 -- menu/cbs/menu_cbs_deferred_push.c | 4 +++- tasks/task_overlay.c | 10 +++++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/command_event.c b/command_event.c index 4fda64f26d..30466d4bb5 100644 --- a/command_event.c +++ b/command_event.c @@ -1345,7 +1345,6 @@ bool event_command(enum event_command cmd) event_command(EVENT_CMD_OVERLAY_DEINIT); #ifdef HAVE_OVERLAY input_overlay_init(); - //RARCH_ERR("%s.\n", msg_hash_to_str(MSG_FAILED_TO_LOAD_OVERLAY)); #endif break; case EVENT_CMD_OVERLAY_NEXT: diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c index 98953188af..b5f7402b95 100644 --- a/libretro-common/net/net_http.c +++ b/libretro-common/net/net_http.c @@ -558,8 +558,6 @@ void net_http_delete(struct http_t *state) if (state->fd != -1) socket_close(state->fd); -// if (state->data) -// free(state->data); free(state); } diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 4cc26afbd2..b087ca04dd 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -364,7 +364,9 @@ error: /* expects http_transfer_t*, menu_file_transfer_t* */ void cb_generic_download(void *task_data, void *user_data, const char *err) -//(void *data, size_t len, const char *dir_path) +#if 0 +(void *data, size_t len, const char *dir_path) +#endif { char msg[PATH_MAX_LENGTH]; char output_path[PATH_MAX_LENGTH]; diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index d775352050..9c657bc28f 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -312,7 +312,9 @@ static void rarch_task_overlay_deferred_loading(overlay_loader_t *loader) case OVERLAY_IMAGE_TRANSFER_NONE: case OVERLAY_IMAGE_TRANSFER_BUSY: loader->loading_status = OVERLAY_IMAGE_TRANSFER_DONE; - //break; +#if 0 + break; +#endif case OVERLAY_IMAGE_TRANSFER_DONE: rarch_task_overlay_image_done(&loader->overlays[loader->pos]); loader->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE; @@ -593,9 +595,11 @@ static void rarch_task_overlay_resolve_iterate(overlay_loader_t *loader) { loader->active = &loader->overlays[0]; +#if 0 /* TODO: MOVE TO MAIN THREAD / CALLBACK */ -// input_overlay_load_active(loader->deferred.opacity); -// input_overlay_enable(loader->deferred.enable); + input_overlay_load_active(loader->deferred.opacity); + input_overlay_enable(loader->deferred.enable); +#endif } loader->resolve_pos += 1;