vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2018-11-14 11:07:12 -05:00
parent de5b626520 f81d01edca
commit 97fd69951a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sdl/IMG_xpm.c
View File

@ -45,9 +45,10 @@
#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);
// 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