Removed STL dependency in Android code.

libsdl-org · Oct 15, 2011 · c04a27e · c04a27e
1 parent a04d19e
commit c04a27e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/core/android/SDL_android.cpp b/src/core/android/SDL_android.cpp
@@ -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