include/SDL_joystick.h
changeset 6738 b408d5a406a3
parent 6707 70eeb7e3ec2f
child 6746 1ae364ea5112
     1.1 --- a/include/SDL_joystick.h	Tue Dec 11 10:50:45 2012 -0800
     1.2 +++ b/include/SDL_joystick.h	Tue Dec 11 11:54:32 2012 -0800
     1.3 @@ -65,7 +65,7 @@
     1.4  /* A structure that encodes the stable unique id for a joystick device */
     1.5  typedef struct {
     1.6  	Uint8 data[16];
     1.7 -} JoystickGUID;
     1.8 +} SDL_JoystickGUID;
     1.9  
    1.10  typedef int SDL_JoystickID;
    1.11  
    1.12 @@ -102,22 +102,22 @@
    1.13  /**
    1.14   *  Return the GUID for the joystick at this index
    1.15   */
    1.16 -extern DECLSPEC JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index);
    1.17 +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index);
    1.18  
    1.19  /**
    1.20   *  Return the GUID for this opened joystick
    1.21   */
    1.22 -extern DECLSPEC JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
    1.23 +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
    1.24  
    1.25  /**
    1.26   *  Return a string representation for this guid. You are responsible for freeing memory from this call
    1.27   */
    1.28 -extern DECLSPEC char *SDLCALL SDL_JoystickGetGUIDString(JoystickGUID guid);
    1.29 +extern DECLSPEC void SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
    1.30  
    1.31  /**
    1.32   *  convert a string into a joystick formatted guid
    1.33   */
    1.34 -extern DECLSPEC JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
    1.35 +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
    1.36  
    1.37  /**
    1.38   *  Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not.