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

Fixed joystick GUID renaming for other platforms

Browse source
This commit is contained in:
Sam Lantinga 2012-12-11 12:16:28 -08:00
parent af4d258edb
commit 5f53c47559
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,9 +131,9 @@ SDL_SYS_JoystickQuit(void)
{ {
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -141,9 +141,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
return guid; return guid;
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );

8
src/joystick/beos/SDL_bejoystick.cc
View file

@ -261,9 +261,9 @@ extern "C"
SDL_joyname[0] = NULL; SDL_joyname[0] = NULL;
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -271,9 +271,9 @@ extern "C"
return guid; return guid;
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );

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

@ -584,9 +584,9 @@ SDL_SYS_JoystickQuit(void)
return; return;
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -594,9 +594,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
return guid; return guid;
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );

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

@ -108,9 +108,9 @@ SDL_SYS_JoystickQuit(void)
return; return;
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -119,9 +119,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );

8
src/joystick/iphoneos/SDL_sysjoystick.m
View file

@ -133,9 +133,9 @@ SDL_SYS_JoystickQuit(void)
return; return;
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -143,9 +143,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
return guid; return guid;
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );

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

@ -186,9 +186,9 @@ SDL_SYS_JoystickQuit(void)
{ {
} }
JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
SDL_zero( guid ); SDL_zero( guid );
@ -196,9 +196,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
return guid; return guid;
} }
JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick) SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
{ {
JoystickGUID guid; SDL_JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now // the GUID is just the first 16 chars of the name for now
const char *name = joystick->name; const char *name = joystick->name;
SDL_zero( guid ); SDL_zero( guid );