From 51768e7dd1e0eff1fec5aa470a593ecfd9f3ae05 Mon Sep 17 00:00:00 2001 From: Marco Z Date: Wed, 14 Nov 2018 08:06:07 -0500 Subject: [PATCH 1/2] Remove unnecessary SDLCALL from xpm declarations --- src/sdl/IMG_xpm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sdl/IMG_xpm.c b/src/sdl/IMG_xpm.c index 8adfd343..9eb13ce8 100644 --- a/src/sdl/IMG_xpm.c +++ b/src/sdl/IMG_xpm.c @@ -44,10 +44,14 @@ #if 0 #include "SDL_image.h" -#else + extern SDLCALL int SDLCALL IMG_isXPM(SDL_RWops *src); extern SDLCALL SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src); extern SDLCALL SDL_Surface * SDLCALL IMG_ReadXPMFromArray(const char **xpm); +#else +extern int IMG_isXPM(SDL_RWops *src); +extern SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src); +extern SDL_Surface *IMG_ReadXPMFromArray(const char **xpm); #define IMG_SetError SDL_SetError #define IMG_GetError SDL_GetError #endif From 8777d5c6c99c241facc12cbfcbd9e2c5ee9aa175 Mon Sep 17 00:00:00 2001 From: Marco Z Date: Wed, 14 Nov 2018 08:15:38 -0500 Subject: [PATCH 2/2] Comment context for declaration changes; remove extern terms --- src/sdl/IMG_xpm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/sdl/IMG_xpm.c b/src/sdl/IMG_xpm.c index 9eb13ce8..af76ec1d 100644 --- a/src/sdl/IMG_xpm.c +++ b/src/sdl/IMG_xpm.c @@ -44,14 +44,11 @@ #if 0 #include "SDL_image.h" - -extern SDLCALL int SDLCALL IMG_isXPM(SDL_RWops *src); -extern SDLCALL SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src); -extern SDLCALL SDL_Surface * SDLCALL IMG_ReadXPMFromArray(const char **xpm); #else -extern int IMG_isXPM(SDL_RWops *src); -extern SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src); -extern SDL_Surface *IMG_ReadXPMFromArray(const char **xpm); +// SDLCALL terms removed from original SDL_image declarations +int IMG_isXPM(SDL_RWops *src); +SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src); +SDL_Surface *IMG_ReadXPMFromArray(const char **xpm); #define IMG_SetError SDL_SetError #define IMG_GetError SDL_GetError #endif