adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alter sdluio function signatures based on SDL version. Fixes ARM build.

Browse Source
This commit is contained in:
Michael Martin
2019-10-06 23:12:50 -07:00
parent 5682c41778
commit e267e107f5
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/graphics/sdl/sdluio.c
+21 -4
View File
@@ -61,9 +61,14 @@ sdluio_loadImage (uio_DirHandle *dir, const char *fileName) {
return result; return result;
} }
#if SDL_MAJOR_VERSION == 1
int int
sdluio_seek (SDL_RWops *context, int offset, int whence) { sdluio_seek (SDL_RWops *context, int offset, int whence)
#else
Sint64
sdluio_seek (SDL_RWops *context, Sint64 offset, int whence)
#endif
{
if (uio_fseek ((uio_Stream *) context->hidden.unknown.data1, offset, if (uio_fseek ((uio_Stream *) context->hidden.unknown.data1, offset,
whence) == -1) whence) == -1)
{ {
@@ -74,8 +79,14 @@ sdluio_seek (SDL_RWops *context, int offset, int whence) {
return uio_ftell ((uio_Stream *) context->hidden.unknown.data1); return uio_ftell ((uio_Stream *) context->hidden.unknown.data1);
} }
#if SDL_MAJOR_VERSION == 1
int int
sdluio_read (SDL_RWops *context, void *ptr, int size, int maxnum) { sdluio_read (SDL_RWops *context, void *ptr, int size, int maxnum)
#else
size_t
sdluio_read (SDL_RWops *context, void *ptr, size_t size, size_t maxnum)
#endif
{
size_t numRead; size_t numRead;
numRead = uio_fread (ptr, (size_t) size, (size_t) maxnum, numRead = uio_fread (ptr, (size_t) size, (size_t) maxnum,
@@ -90,8 +101,14 @@ sdluio_read (SDL_RWops *context, void *ptr, int size, int maxnum) {
return (int) numRead; return (int) numRead;
} }
#if SDL_MAJOR_VERSION == 1
int int
sdluio_write (SDL_RWops *context, const void *ptr, int size, int num) { sdluio_write (SDL_RWops *context, const void *ptr, int size, int num)
#else
size_t
sdluio_write (SDL_RWops *context, const void *ptr, size_t size, size_t num)
#endif
{
size_t numWritten; size_t numWritten;
numWritten = uio_fwrite (ptr, (size_t) size, (size_t) num, numWritten = uio_fwrite (ptr, (size_t) size, (size_t) num,
sc2/src/libs/graphics/sdl/sdluio.h
+6
View File
@@ -23,9 +23,15 @@
#include SDL_INCLUDE(SDL_rwops.h) #include SDL_INCLUDE(SDL_rwops.h)
SDL_Surface *sdluio_loadImage (uio_DirHandle *dir, const char *fileName); SDL_Surface *sdluio_loadImage (uio_DirHandle *dir, const char *fileName);
#if SDL_MAJOR_VERSION == 1
int sdluio_seek (SDL_RWops *context, int offset, int whence); int sdluio_seek (SDL_RWops *context, int offset, int whence);
int sdluio_read (SDL_RWops *context, void *ptr, int size, int maxnum); int sdluio_read (SDL_RWops *context, void *ptr, int size, int maxnum);
int sdluio_write (SDL_RWops *context, const void *ptr, int size, int num); int sdluio_write (SDL_RWops *context, const void *ptr, int size, int num);
#else
Sint64 sdlui_seek (SDL_RWops *context, Sint64 offset, int whence);
size_t sdlui_read (SDL_RWops *context, void *ptr, size_t size, size_t maxnum);
size_t sdlui_write (SDL_RWops *contex, const void *ptr, size_t size, size_t num);
#endif
int sdluio_close (SDL_RWops *context); int sdluio_close (SDL_RWops *context);