eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-23 04:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed build errors after SDL_IOWhence change

Browse source
This commit is contained in:
Sam Lantinga 2024-06-09 08:26:29 -07:00 • committed by Ryan C. Gordon
parent 9651ca5918
commit 3e018517c3
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/android/SDL_android.c
View file

@ -2040,9 +2040,9 @@ Sint64 Android_JNI_FileSize(void *userdata)
return (Sint64) AAsset_getLength64((AAsset *)userdata); return (Sint64) AAsset_getLength64((AAsset *)userdata);
} }
Sint64 Android_JNI_FileSeek(void *userdata, Sint64 offset, int whence) Sint64 Android_JNI_FileSeek(void *userdata, Sint64 offset, SDL_IOWhence whence)
{ {
return (Sint64) AAsset_seek64((AAsset *)userdata, offset, whence); return (Sint64) AAsset_seek64((AAsset *)userdata, offset, (int)whence);
} }
int Android_JNI_FileClose(void *userdata) int Android_JNI_FileClose(void *userdata)

2
src/core/android/SDL_android.h
View file

@ -68,7 +68,7 @@ extern SDL_bool Android_IsChromebook(void);
int Android_JNI_FileOpen(void **puserdata, const char *fileName, const char *mode); int Android_JNI_FileOpen(void **puserdata, const char *fileName, const char *mode);
Sint64 Android_JNI_FileSize(void *userdata); Sint64 Android_JNI_FileSize(void *userdata);
Sint64 Android_JNI_FileSeek(void *userdata, Sint64 offset, int whence); Sint64 Android_JNI_FileSeek(void *userdata, Sint64 offset, SDL_IOWhence whence);
size_t Android_JNI_FileRead(void *userdata, void *buffer, size_t size, SDL_IOStatus *status); size_t Android_JNI_FileRead(void *userdata, void *buffer, size_t size, SDL_IOStatus *status);
size_t Android_JNI_FileWrite(void *userdata, const void *buffer, size_t size, SDL_IOStatus *status); size_t Android_JNI_FileWrite(void *userdata, const void *buffer, size_t size, SDL_IOStatus *status);
int Android_JNI_FileClose(void *userdata); int Android_JNI_FileClose(void *userdata);

2
test/testautomation_iostream.c
View file

@ -190,7 +190,7 @@ static void testGenericIOStreamValidations(SDL_IOStream *rw, SDL_bool write)
(int)i); (int)i);
/* Invalid whence seek */ /* Invalid whence seek */
i = SDL_SeekIO(rw, 0, 999); i = SDL_SeekIO(rw, 0, (SDL_IOWhence)999);
SDLTest_AssertPass("Call to SDL_SeekIO(...,0,invalid_whence) succeeded"); SDLTest_AssertPass("Call to SDL_SeekIO(...,0,invalid_whence) succeeded");
SDLTest_AssertCheck( SDLTest_AssertCheck(
i == (Sint64)(-1), i == (Sint64)(-1),