Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Kart-Public
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
brokenspleentec
Kart-Public
Commits
97fd6995
Commit
97fd6995
authored
6 years ago
by
Alam Ed Arias
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into next
parents
de5b6265
f81d01ed
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sdl/IMG_xpm.c
+4
-3
4 additions, 3 deletions
src/sdl/IMG_xpm.c
with
4 additions
and
3 deletions
src/sdl/IMG_xpm.c
+
4
−
3
View file @
97fd6995
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment