pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed STL dependency in Android code.

Browse source
This commit is contained in:
Ryan C. Gordon 2011-10-15 14:16:29 -07:00
parent aa76adf490
commit bba4029d9b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/android/SDL_android.cpp
View file

@ -23,8 +23,6 @@
#include "SDL_android.h"
#include <algorithm>
extern "C" {
#include "../../events/SDL_events_c.h"
#include "../../video/android/SDL_androidkeyboard.h"
@ -521,8 +519,11 @@ extern "C" long Android_JNI_FileSeek(SDL_RWops* ctx, long offset, int whence)
// The easy case where we're seeking forwards
while (movement > 0) {
size_t result = Android_JNI_FileRead(ctx, buffer, 1,
std::min(movement, (long)sizeof(buffer)));
long amount = (long) sizeof (buffer);
if (amount > movement) {
amount = movement;
}
size_t result = Android_JNI_FileRead(ctx, buffer, 1, amount);
if (result <= 0) {
// Failed to read/skip the required amount, so fail