Skip to content
Snippets Groups Projects
Commit 97fd6995 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents de5b6265 f81d01ed
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment