From dc32b02aa06b0cd37b673b4bc2a23fe0eb48af87 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 11 Dec 2012 12:16:28 -0800 Subject: [PATCH] Fixed joystick GUID renaming for other platforms --- src/joystick/android/SDL_sysjoystick.c | 8 ++++---- src/joystick/beos/SDL_bejoystick.cc | 8 ++++---- src/joystick/bsd/SDL_sysjoystick.c | 8 ++++---- src/joystick/dummy/SDL_sysjoystick.c | 8 ++++---- src/joystick/iphoneos/SDL_sysjoystick.m | 8 ++++---- src/joystick/nds/SDL_sysjoystick.c | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c index d2d94dcaa..78208c0b7 100644 --- a/src/joystick/android/SDL_sysjoystick.c +++ b/src/joystick/android/SDL_sysjoystick.c @@ -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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); SDL_zero( guid ); @@ -141,9 +141,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) 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 const char *name = joystick->name; SDL_zero( guid ); diff --git a/src/joystick/beos/SDL_bejoystick.cc b/src/joystick/beos/SDL_bejoystick.cc index a76e23ab3..1fc35184e 100644 --- a/src/joystick/beos/SDL_bejoystick.cc +++ b/src/joystick/beos/SDL_bejoystick.cc @@ -261,9 +261,9 @@ extern "C" 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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); SDL_zero( guid ); @@ -271,9 +271,9 @@ extern "C" 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 const char *name = joystick->name; SDL_zero( guid ); diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index e090e28db..fc2e9c3db 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -584,9 +584,9 @@ SDL_SYS_JoystickQuit(void) 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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); SDL_zero( guid ); @@ -594,9 +594,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) 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 const char *name = joystick->name; SDL_zero( guid ); diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c index 54e692a0e..1bcf1ce93 100644 --- a/src/joystick/dummy/SDL_sysjoystick.c +++ b/src/joystick/dummy/SDL_sysjoystick.c @@ -108,9 +108,9 @@ SDL_SYS_JoystickQuit(void) 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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); 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 const char *name = joystick->name; SDL_zero( guid ); diff --git a/src/joystick/iphoneos/SDL_sysjoystick.m b/src/joystick/iphoneos/SDL_sysjoystick.m index a8e11dd62..291e96a1d 100644 --- a/src/joystick/iphoneos/SDL_sysjoystick.m +++ b/src/joystick/iphoneos/SDL_sysjoystick.m @@ -133,9 +133,9 @@ SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick) 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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); SDL_zero( guid ); @@ -143,9 +143,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) 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 const char *name = joystick->name; SDL_zero( guid ); diff --git a/src/joystick/nds/SDL_sysjoystick.c b/src/joystick/nds/SDL_sysjoystick.c index 9e64a3bd0..a304473fb 100644 --- a/src/joystick/nds/SDL_sysjoystick.c +++ b/src/joystick/nds/SDL_sysjoystick.c @@ -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 const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index ); SDL_zero( guid ); @@ -196,9 +196,9 @@ JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index ) 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 const char *name = joystick->name; SDL_zero( guid );