Skip to content

Commit

Permalink
Some C89 build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 committed Jun 26, 2015
1 parent f597f3e commit a132fa0
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion command_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ enum event_command
EVENT_CMD_REMAPPING_DEINIT,
EVENT_CMD_VOLUME_UP,
EVENT_CMD_VOLUME_DOWN,
EVENT_CMD_DATA_RUNLOOP_FREE,
EVENT_CMD_DATA_RUNLOOP_FREE
};

typedef struct event_cmd_state
Expand Down
4 changes: 2 additions & 2 deletions dynamic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
enum rarch_core_type
{
CORE_TYPE_PLAIN = 0,
CORE_TYPE_DUMMY,
CORE_TYPE_DUMMY
#ifdef HAVE_FFMPEG
CORE_TYPE_FFMPEG,
,CORE_TYPE_FFMPEG
#endif
};

Expand Down
4 changes: 2 additions & 2 deletions frontend/frontend_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ enum frontend_powerstate
FRONTEND_POWERSTATE_NO_SOURCE,
FRONTEND_POWERSTATE_CHARGING,
FRONTEND_POWERSTATE_CHARGED,
FRONTEND_POWERSTATE_ON_POWER_SOURCE,
FRONTEND_POWERSTATE_ON_POWER_SOURCE
};

enum frontend_architecture
Expand All @@ -45,7 +45,7 @@ enum frontend_architecture
FRONTEND_ARCH_PPC,
FRONTEND_ARCH_ARM,
FRONTEND_ARCH_MIPS,
FRONTEND_ARCH_TILE,
FRONTEND_ARCH_TILE
};

typedef void (*environment_get_t)(int *argc, char *argv[], void *args,
Expand Down
2 changes: 1 addition & 1 deletion gfx/video_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ enum texture_filter_type
TEXTURE_FILTER_LINEAR = 0,
TEXTURE_FILTER_NEAREST,
TEXTURE_FILTER_MIPMAP_LINEAR,
TEXTURE_FILTER_MIPMAP_NEAREST,
TEXTURE_FILTER_MIPMAP_NEAREST
};

#define FONT_COLOR_RGBA(r, g, b, a) (((r) << 24) | ((g) << 16) | ((b) << 8) | ((a) << 0))
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/linuxraw_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ static void linuxraw_input_poll(void *data)
pressed = !(c & 0x80);
c &= ~0x80;

// ignore extended scancodes
/* ignore extended scancodes */
if (!c)
read(STDIN_FILENO, &t, 2);
else
Expand Down
4 changes: 2 additions & 2 deletions input/input_overlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ enum overlay_status
OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE,
OVERLAY_STATUS_DEFERRED_DONE,
OVERLAY_STATUS_DEFERRED_ERROR,
OVERLAY_STATUS_ALIVE,
OVERLAY_STATUS_ALIVE
};

enum overlay_image_transfer_status
Expand All @@ -90,7 +90,7 @@ enum overlay_image_transfer_status
OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE,
OVERLAY_IMAGE_TRANSFER_DESC_ITERATE,
OVERLAY_IMAGE_TRANSFER_DESC_DONE,
OVERLAY_IMAGE_TRANSFER_ERROR,
OVERLAY_IMAGE_TRANSFER_ERROR
};

struct overlay_desc
Expand Down
2 changes: 1 addition & 1 deletion libretro-common/include/formats/image.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ enum image_process_code
IMAGE_PROCESS_ERROR = -2,
IMAGE_PROCESS_ERROR_END = -1,
IMAGE_PROCESS_NEXT = 0,
IMAGE_PROCESS_END = 1,
IMAGE_PROCESS_END = 1
};

struct texture_image
Expand Down
2 changes: 1 addition & 1 deletion menu/menu_animation.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ enum menu_animation_easing_type
EASING_IN_BOUNCE,
EASING_OUT_BOUNCE,
EASING_IN_OUT_BOUNCE,
EASING_OUT_IN_BOUNCE,
EASING_OUT_IN_BOUNCE
};

void menu_animation_free(
Expand Down
2 changes: 1 addition & 1 deletion menu/menu_displaylist.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ enum
DISPLAYLIST_OPTIONS_REMAPPINGS,
DISPLAYLIST_OPTIONS_MANAGEMENT,
DISPLAYLIST_OPTIONS_DISK,
DISPLAYLIST_OPTIONS_SHADERS,
DISPLAYLIST_OPTIONS_SHADERS
};

typedef struct menu_displaylist_info
Expand Down
2 changes: 1 addition & 1 deletion menu/menu_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef enum
{
MENU_IMAGE_NONE = 0,
MENU_IMAGE_WALLPAPER,
MENU_IMAGE_BOXART,
MENU_IMAGE_BOXART
} menu_image_type_t;

typedef struct
Expand Down
4 changes: 2 additions & 2 deletions menu/menu_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ enum mouse_action
MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
MOUSE_ACTION_BUTTON_R,
MOUSE_ACTION_WHEEL_UP,
MOUSE_ACTION_WHEEL_DOWN,
MOUSE_ACTION_WHEEL_DOWN
};

enum menu_input_bind_mode
{
MENU_INPUT_BIND_NONE,
MENU_INPUT_BIND_SINGLE,
MENU_INPUT_BIND_ALL,
MENU_INPUT_BIND_ALL
};

struct menu_bind_state_port
Expand Down
2 changes: 1 addition & 1 deletion menu/menu_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ typedef struct menu_list
typedef enum
{
MENU_LIST_PLAIN = 0,
MENU_LIST_HORIZONTAL,
MENU_LIST_HORIZONTAL
} menu_list_type_t;

typedef struct menu_file_list_cbs
Expand Down
4 changes: 2 additions & 2 deletions menu/menu_setting.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ enum setting_list_flags
SL_FLAG_LOGGING_OPTIONS = (1 << 26),
SL_FLAG_SAVING_OPTIONS = (1 << 27),
SL_FLAG_ALL = (1 << 28),
SL_FLAG_ALLOW_EMPTY_LIST = (1 << 29),
SL_FLAG_ALLOW_EMPTY_LIST = (1 << 29)
};

#define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)
Expand Down Expand Up @@ -289,7 +289,7 @@ void setting_get_label(file_list_t *list, char *s,
size_t len, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned idx);

void menu_setting_free(rarch_setting_t *list);;
void menu_setting_free(rarch_setting_t *list);

/**
* setting_new:
Expand Down

0 comments on commit a132fa0

Please sign in to comment.