From fbb32955a4389aaf3ebb72f168b9c980afac48f8 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 8 Jan 2014 14:10:06 +0800
Subject: [PATCH] Fixed asset_manager.h, rect_manager.h, and jni.h

1. Fixed missing #include <sys/types.h> in android/asset_manager.h for API >= 13
2. Fixed missing #include <stdint.h> in android/rect_manager.h for API >= 14
3. Added JNICALL to JNI_OnLoad and JNI_OnUnload in jni.h

Change-Id: I875ec0b6e6f7c2f433c176f0a738eb78f3c33062
---
 ndk/platforms/android-13/include/android/asset_manager.h | 2 ++
 ndk/platforms/android-14/include/android/rect.h          | 2 ++
 ndk/platforms/android-3/include/jni.h                    | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ndk/platforms/android-13/include/android/asset_manager.h b/ndk/platforms/android-13/include/android/asset_manager.h
index f5df46bd7..6ac350e9d 100644
--- a/ndk/platforms/android-13/include/android/asset_manager.h
+++ b/ndk/platforms/android-13/include/android/asset_manager.h
@@ -18,6 +18,8 @@
 #ifndef ANDROID_ASSET_MANAGER_H
 #define ANDROID_ASSET_MANAGER_H
 
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ndk/platforms/android-14/include/android/rect.h b/ndk/platforms/android-14/include/android/rect.h
index 64d487dc2..bcd42a99e 100644
--- a/ndk/platforms/android-14/include/android/rect.h
+++ b/ndk/platforms/android-14/include/android/rect.h
@@ -18,6 +18,8 @@
 #ifndef ANDROID_RECT_H
 #define ANDROID_RECT_H
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ndk/platforms/android-3/include/jni.h b/ndk/platforms/android-3/include/jni.h
index 5a01fff72..f36398fc5 100644
--- a/ndk/platforms/android-3/include/jni.h
+++ b/ndk/platforms/android-3/include/jni.h
@@ -1144,8 +1144,8 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
  * Prototypes for functions exported by loadable shared libs.  These are
  * called by JNI, not provided by JNI.
  */
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved);
-JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved);
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved);
+JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved);
 
 #ifdef __cplusplus
 }