mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-28 13:21:10 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
97fd69951a
1 changed files with 4 additions and 3 deletions
|
@ -45,9 +45,10 @@
|
||||||
#if 0
|
#if 0
|
||||||
#include "SDL_image.h"
|
#include "SDL_image.h"
|
||||||
#else
|
#else
|
||||||
extern SDLCALL int SDLCALL IMG_isXPM(SDL_RWops *src);
|
// SDLCALL terms removed from original SDL_image declarations
|
||||||
extern SDLCALL SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src);
|
int IMG_isXPM(SDL_RWops *src);
|
||||||
extern SDLCALL SDL_Surface * SDLCALL IMG_ReadXPMFromArray(const char **xpm);
|
SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src);
|
||||||
|
SDL_Surface *IMG_ReadXPMFromArray(const char **xpm);
|
||||||
#define IMG_SetError SDL_SetError
|
#define IMG_SetError SDL_SetError
|
||||||
#define IMG_GetError SDL_GetError
|
#define IMG_GetError SDL_GetError
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue