ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent redefinition of struct

This commit is contained in:
Twinaphex 2014-10-26 01:09:34 +02:00
parent d7a918397c
commit b437565059
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver.h
View File

@ -29,6 +29,7 @@
#include "gfx/filters/softfilter.h" #include "gfx/filters/softfilter.h"
#include "gfx/shader/shader_parse.h" #include "gfx/shader/shader_parse.h"
#include "audio/dsp_filter.h" #include "audio/dsp_filter.h"
#include "input/input_context.h"
#include "input/overlay.h" #include "input/overlay.h"
#include "frontend/frontend_context.h" #include "frontend/frontend_context.h"
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
@ -240,8 +241,6 @@ enum analog_dpad_mode
ANALOG_DPAD_LAST ANALOG_DPAD_LAST
}; };
typedef struct rarch_joypad_driver rarch_joypad_driver_t;
typedef struct input_driver typedef struct input_driver
{ {
void *(*init)(void); void *(*init)(void);

3
input/input_context.h
View File

@ -24,7 +24,6 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <boolean.h> #include <boolean.h>
typedef struct rarch_joypad_driver rarch_joypad_driver_t;
enum retro_rumble_effect; enum retro_rumble_effect;
struct rarch_joypad_driver struct rarch_joypad_driver
@ -40,6 +39,8 @@ struct rarch_joypad_driver
const char *ident; const char *ident;
}; };
typedef struct rarch_joypad_driver rarch_joypad_driver_t;
/* If ident points to NULL or a zero-length string, /* If ident points to NULL or a zero-length string,
* equivalent to calling input_joypad_init_first(). */ * equivalent to calling input_joypad_init_first(). */