Fixed joystick GUID renaming for other platforms
authorSam Lantinga <slouken@libsdl.org>
Tue, 11 Dec 2012 12:16:28 -0800
changeset 6744 4ac2bb6dc80c
parent 6743 1835c3299b2a
child 6745 de3683865c14
Fixed joystick GUID renaming for other platforms
src/joystick/android/SDL_sysjoystick.c
src/joystick/beos/SDL_bejoystick.cc
src/joystick/bsd/SDL_sysjoystick.c
src/joystick/dummy/SDL_sysjoystick.c
src/joystick/iphoneos/SDL_sysjoystick.m
src/joystick/nds/SDL_sysjoystick.c
--- a/src/joystick/android/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/android/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
@@ -131,9 +131,9 @@
 {
 }
 
-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 @@
     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 );
--- a/src/joystick/beos/SDL_bejoystick.cc	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/beos/SDL_bejoystick.cc	Tue Dec 11 12:16:28 2012 -0800
@@ -261,9 +261,9 @@
         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 @@
         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 );
--- a/src/joystick/bsd/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/bsd/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
@@ -584,9 +584,9 @@
     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 @@
     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 );
--- a/src/joystick/dummy/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/dummy/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
@@ -108,9 +108,9 @@
     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_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 );
--- a/src/joystick/iphoneos/SDL_sysjoystick.m	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/iphoneos/SDL_sysjoystick.m	Tue Dec 11 12:16:28 2012 -0800
@@ -133,9 +133,9 @@
     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 @@
     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 );
--- a/src/joystick/nds/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
+++ b/src/joystick/nds/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
@@ -186,9 +186,9 @@
 {
 }
 
-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 @@
     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 );