Commit e9af6dcd93e92013198ec7cc8445555632b86c37
2013-11-23T15:52:49
Fixed a few public APIs that we accidentally neglected to mark as SDLCALL. Fixes Bugzilla #2262.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
index b0e4b5d..a2843ba 100644
--- a/include/SDL_joystick.h
+++ b/include/SDL_joystick.h
@@ -115,7 +115,7 @@ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joys
* Return a string representation for this guid. pszGUID must point to at least 33 bytes
* (32 for the string plus a NULL terminator).
*/
-extern DECLSPEC void SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
+extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
/**
* convert a string into a joystick formatted guid
diff --git a/include/SDL_main.h b/include/SDL_main.h
index b7e4a10..da80a78 100644
--- a/include/SDL_main.h
+++ b/include/SDL_main.h
@@ -101,7 +101,7 @@ extern "C" {
* Calling this yourself without knowing what you're doing can cause
* crashes and hard to diagnose problems with your application.
*/
-extern DECLSPEC void SDL_SetMainReady(void);
+extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
#ifdef __WIN32__
diff --git a/include/SDL_render.h b/include/SDL_render.h
index a765dc7..94bf1e6 100644
--- a/include/SDL_render.h
+++ b/include/SDL_render.h
@@ -596,7 +596,7 @@ extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
*
* \return 0 on success, or -1 on error
*/
-extern DECLSPEC int SDL_SetRenderDrawColor(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
Uint8 r, Uint8 g, Uint8 b,
Uint8 a);
@@ -612,7 +612,7 @@ extern DECLSPEC int SDL_SetRenderDrawColor(SDL_Renderer * renderer,
*
* \return 0 on success, or -1 on error
*/
-extern DECLSPEC int SDL_GetRenderDrawColor(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
Uint8 * r, Uint8 * g, Uint8 * b,
Uint8 * a);