Fixed joystick GUID renaming for other platforms
authorSam Lantinga <slouken@libsdl.org>
Tue, 11 Dec 2012 12:16:28 -0800
changeset 67444ac2bb6dc80c
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
     1.1 --- a/src/joystick/android/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
     1.2 +++ b/src/joystick/android/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
     1.3 @@ -131,9 +131,9 @@
     1.4  {
     1.5  }
     1.6  
     1.7 -JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     1.8 +SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     1.9  {
    1.10 -    JoystickGUID guid;
    1.11 +    SDL_JoystickGUID guid;
    1.12      // the GUID is just the first 16 chars of the name for now
    1.13      const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    1.14      SDL_zero( guid );
    1.15 @@ -141,9 +141,9 @@
    1.16      return guid;
    1.17  }
    1.18  
    1.19 -JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    1.20 +SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    1.21  {
    1.22 -    JoystickGUID guid;
    1.23 +    SDL_JoystickGUID guid;
    1.24      // the GUID is just the first 16 chars of the name for now
    1.25      const char *name = joystick->name;
    1.26      SDL_zero( guid );
     2.1 --- a/src/joystick/beos/SDL_bejoystick.cc	Tue Dec 11 12:08:36 2012 -0800
     2.2 +++ b/src/joystick/beos/SDL_bejoystick.cc	Tue Dec 11 12:16:28 2012 -0800
     2.3 @@ -261,9 +261,9 @@
     2.4          SDL_joyname[0] = NULL;
     2.5      }
     2.6  
     2.7 -    JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     2.8 +    SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     2.9      {
    2.10 -        JoystickGUID guid;
    2.11 +        SDL_JoystickGUID guid;
    2.12          // the GUID is just the first 16 chars of the name for now
    2.13          const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    2.14          SDL_zero( guid );
    2.15 @@ -271,9 +271,9 @@
    2.16          return guid;
    2.17      }
    2.18  
    2.19 -    JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    2.20 +    SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    2.21      {
    2.22 -        JoystickGUID guid;
    2.23 +        SDL_JoystickGUID guid;
    2.24          // the GUID is just the first 16 chars of the name for now
    2.25          const char *name = joystick->name;
    2.26          SDL_zero( guid );
     3.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
     3.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
     3.3 @@ -584,9 +584,9 @@
     3.4      return;
     3.5  }
     3.6  
     3.7 -JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     3.8 +SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     3.9  {
    3.10 -    JoystickGUID guid;
    3.11 +    SDL_JoystickGUID guid;
    3.12      // the GUID is just the first 16 chars of the name for now
    3.13      const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    3.14      SDL_zero( guid );
    3.15 @@ -594,9 +594,9 @@
    3.16      return guid;
    3.17  }
    3.18  
    3.19 -JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    3.20 +SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    3.21  {
    3.22 -    JoystickGUID guid;
    3.23 +    SDL_JoystickGUID guid;
    3.24      // the GUID is just the first 16 chars of the name for now
    3.25      const char *name = joystick->name;
    3.26      SDL_zero( guid );
     4.1 --- a/src/joystick/dummy/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
     4.2 +++ b/src/joystick/dummy/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
     4.3 @@ -108,9 +108,9 @@
     4.4      return;
     4.5  }
     4.6  
     4.7 -JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     4.8 +SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     4.9  {
    4.10 -    JoystickGUID guid;
    4.11 +    SDL_JoystickGUID guid;
    4.12      // the GUID is just the first 16 chars of the name for now
    4.13      const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    4.14      SDL_zero( guid );
    4.15 @@ -119,9 +119,9 @@
    4.16  }
    4.17  
    4.18  
    4.19 -JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    4.20 +SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    4.21  {
    4.22 -    JoystickGUID guid;
    4.23 +    SDL_JoystickGUID guid;
    4.24      // the GUID is just the first 16 chars of the name for now
    4.25      const char *name = joystick->name;
    4.26      SDL_zero( guid );
     5.1 --- a/src/joystick/iphoneos/SDL_sysjoystick.m	Tue Dec 11 12:08:36 2012 -0800
     5.2 +++ b/src/joystick/iphoneos/SDL_sysjoystick.m	Tue Dec 11 12:16:28 2012 -0800
     5.3 @@ -133,9 +133,9 @@
     5.4      return;
     5.5  }
     5.6  
     5.7 -JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     5.8 +SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     5.9  {
    5.10 -    JoystickGUID guid;
    5.11 +    SDL_JoystickGUID guid;
    5.12      // the GUID is just the first 16 chars of the name for now
    5.13      const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    5.14      SDL_zero( guid );
    5.15 @@ -143,9 +143,9 @@
    5.16      return guid;
    5.17  }
    5.18  
    5.19 -JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    5.20 +SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    5.21  {
    5.22 -    JoystickGUID guid;
    5.23 +    SDL_JoystickGUID guid;
    5.24      // the GUID is just the first 16 chars of the name for now
    5.25      const char *name = joystick->name;
    5.26      SDL_zero( guid );
     6.1 --- a/src/joystick/nds/SDL_sysjoystick.c	Tue Dec 11 12:08:36 2012 -0800
     6.2 +++ b/src/joystick/nds/SDL_sysjoystick.c	Tue Dec 11 12:16:28 2012 -0800
     6.3 @@ -186,9 +186,9 @@
     6.4  {
     6.5  }
     6.6  
     6.7 -JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     6.8 +SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
     6.9  {
    6.10 -    JoystickGUID guid;
    6.11 +    SDL_JoystickGUID guid;
    6.12      // the GUID is just the first 16 chars of the name for now
    6.13      const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
    6.14      SDL_zero( guid );
    6.15 @@ -196,9 +196,9 @@
    6.16      return guid;
    6.17  }
    6.18  
    6.19 -JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    6.20 +SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
    6.21  {
    6.22 -    JoystickGUID guid;
    6.23 +    SDL_JoystickGUID guid;
    6.24      // the GUID is just the first 16 chars of the name for now
    6.25      const char *name = joystick->name;
    6.26      SDL_zero( guid );