C89_BUILD fixes

This commit is contained in:
twinaphex 2015-09-06 23:43:27 +02:00
parent d4ce118b1c
commit bbe210f7eb
6 changed files with 11 additions and 7 deletions

View File

@ -554,12 +554,13 @@ static void gl_create_fbo_textures(gl_t *gl)
static bool gl_create_fbo_targets(gl_t *gl) static bool gl_create_fbo_targets(gl_t *gl)
{ {
int i; int i;
GLenum status;
if (!gl) if (!gl)
return false; return false;
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glGenFramebuffers(gl->fbo_pass, gl->fbo); glGenFramebuffers(gl->fbo_pass, gl->fbo);
GLenum status;
for (i = 0; i < gl->fbo_pass; i++) for (i = 0; i < gl->fbo_pass; i++)
{ {

View File

@ -297,7 +297,7 @@ enum
PUSH_ARCHIVE_OPEN_DETECT_CORE = 0, PUSH_ARCHIVE_OPEN_DETECT_CORE = 0,
PUSH_ARCHIVE_OPEN, PUSH_ARCHIVE_OPEN,
PUSH_DEFAULT, PUSH_DEFAULT,
PUSH_DETECT_CORE_LIST, PUSH_DETECT_CORE_LIST
}; };

View File

@ -636,9 +636,9 @@ const char *menu_hash_to_str_es(uint32_t hash)
return "Iniciando descarga: "; return "Iniciando descarga: ";
case MENU_VALUE_SECONDS: case MENU_VALUE_SECONDS:
return "segundos"; return "segundos";
case MENU_VALUE_OFF: //Not changed. Would be "SÍ" case MENU_VALUE_OFF: /* Not changed. Would be "SÍ" */
return "OFF"; return "OFF";
case MENU_VALUE_ON: //Not changed. Would be "NO" case MENU_VALUE_ON: /* Not changed. Would be "NO" */
return "ON"; return "ON";
case MENU_LABEL_VALUE_UPDATE_ASSETS: case MENU_LABEL_VALUE_UPDATE_ASSETS:
return "Actualizar recursos"; return "Actualizar recursos";

View File

@ -403,6 +403,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
{ {
int controller;
char feat_str[PATH_MAX_LENGTH] = {0}; char feat_str[PATH_MAX_LENGTH] = {0};
char tmp[PATH_MAX_LENGTH] = {0}; char tmp[PATH_MAX_LENGTH] = {0};
char tmp2[PATH_MAX_LENGTH] = {0}; char tmp2[PATH_MAX_LENGTH] = {0};
@ -445,7 +446,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_list_push(info->list, cpu_str, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); menu_list_push(info->list, cpu_str, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
} }
for(int controller = 0; controller < MAX_USERS; controller++) for(controller = 0; controller < MAX_USERS; controller++)
{ {
if (settings->input.autoconfigured[controller]) if (settings->input.autoconfigured[controller])
{ {

View File

@ -68,7 +68,7 @@ typedef enum
{ {
MENU_VIDEO_DRIVER_GENERIC = 0, MENU_VIDEO_DRIVER_GENERIC = 0,
MENU_VIDEO_DRIVER_OPENGL, MENU_VIDEO_DRIVER_OPENGL,
MENU_VIDEO_DRIVER_DIRECT3D, MENU_VIDEO_DRIVER_DIRECT3D
} menu_video_driver_type_t; } menu_video_driver_type_t;
typedef struct typedef struct

View File

@ -358,7 +358,9 @@ static bool menu_input_poll_find_trigger(struct menu_bind_state *state,
/* Update the joypad mapping automatically. /* Update the joypad mapping automatically.
* More friendly that way. */ * More friendly that way. */
//settings->input.joypad_map[state->user] = i; #if 0
settings->input.joypad_map[state->user] = i;
#endif
return true; return true;
} }
return false; return false;