[fixed] stb_image.c had a typedef that was incompatible with Android types.h.

diff --git a/gdx/jni/gdx2d/gdx2d.c b/gdx/jni/gdx2d/gdx2d.c
index 0fb015e..c71b5af 100644 (file)
--- a/gdx/jni/gdx2d/gdx2d.c
+++ b/gdx/jni/gdx2d/gdx2d.c
@@ -12,7 +12,6 @@
  */\r
 #include "gdx2d.h"\r
 #define STB_TRUETYPE_IMPLEMENTATION\r
-#define STBI_HEADER_FILE_ONLY\r
 #define STBI_NO_FAILURE_STRINGS\r
 #include "stb_image.c"\r
 #include "stb_truetype.h"\r

diff --git a/gdx/jni/gdx2d/stb_image.c b/gdx/jni/gdx2d/stb_image.c
index c26b420..0121354 100644 (file)
--- a/gdx/jni/gdx2d/stb_image.c
+++ b/gdx/jni/gdx2d/stb_image.c
@@ -441,7 +441,9 @@ typedef unsigned short uint16;
 typedef   signed short  int16;\r
 typedef unsigned int   uint32;\r
 typedef   signed int    int32;\r
+#ifndef __ANDROID__\r
 typedef unsigned int   uint;\r
+#endif\r
 \r
 // should produce compiler error if size is wrong\r
 typedef unsigned char validate_uint32[sizeof(uint32)==4 ? 1 : -1];\r