pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling Linux code

Browse source
This commit is contained in:
Sam Lantinga 2012-12-11 12:08:36 -08:00
parent 71f9f9517c
commit af4d258edb
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/joystick/linux/SDL_sysjoystick.c
View file

@ -174,7 +174,7 @@ typedef struct SDL_joylist_item
int device_instance; int device_instance;
char *path; /* "/dev/input/event2" or whatever */ char *path; /* "/dev/input/event2" or whatever */
char *name; /* "SideWinder 3D Pro" or whatever */ char *name; /* "SideWinder 3D Pro" or whatever */
JoystickGUID guid; SDL_JoystickGUID guid;
dev_t devnum; dev_t devnum;
struct joystick_hwdata *hwdata; struct joystick_hwdata *hwdata;
struct SDL_joylist_item *next; struct SDL_joylist_item *next;
@ -190,7 +190,7 @@ static int instance_counter = 0;
#define NBITS(x) ((((x)-1)/(sizeof(long) * 8))+1) #define NBITS(x) ((((x)-1)/(sizeof(long) * 8))+1)
static int static int
IsJoystick(int fd, char *namebuf, const size_t namebuflen, JoystickGUID *guid) IsJoystick(int fd, char *namebuf, const size_t namebuflen, SDL_JoystickGUID *guid)
{ {
unsigned long evbit[NBITS(EV_MAX)] = { 0 }; unsigned long evbit[NBITS(EV_MAX)] = { 0 };
unsigned long keybit[NBITS(KEY_MAX)] = { 0 }; unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
@ -240,7 +240,7 @@ MaybeAddDevice(const char *path)
int fd = -1; int fd = -1;
int isstick = 0; int isstick = 0;
char namebuf[128]; char namebuf[128];
JoystickGUID guid; SDL_JoystickGUID guid;
SDL_joylist_item *item; SDL_joylist_item *item;
if (path == NULL) { if (path == NULL) {
@ -955,13 +955,11 @@ SDL_SYS_JoystickQuit(void)
SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid;
return JoystickByDevIndex(device_index)->guid; return JoystickByDevIndex(device_index)->guid;
} }
SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid;
return joystick->hwdata->guid; return joystick->hwdata->guid;
} }

2
src/joystick/linux/SDL_sysjoystick_c.h
View file

@ -28,7 +28,7 @@ struct joystick_hwdata
int device_instance; int device_instance;
SDL_bool removed; SDL_bool removed;
JoystickGUID guid; SDL_JoystickGUID guid;
char *fname; /* Used in haptic subsystem */ char *fname; /* Used in haptic subsystem */
/* The current linux joystick driver maps hats to two axes */ /* The current linux joystick driver maps hats to two axes */