From e9af6dcd93e92013198ec7cc8445555632b86c37 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 23 Nov 2013 15:52:49 -0500 Subject: [PATCH] Fixed a few public APIs that we accidentally neglected to mark as SDLCALL. Fixes Bugzilla #2262. --- include/SDL_joystick.h | 2 +- include/SDL_main.h | 2 +- include/SDL_render.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h index b0e4b5dab8580..a2843bae21cf7 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 b7e4a10e5ef3d..da80a780b64c1 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 a765dc79f0c20..94bf1e6a7d176 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);