am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"

* commit 'bdd8dd7d1fa6fa2f791e4e85e924333add90bb58': Fixed compilation error #include <android/*h>
2012-04-20 01:18:01 -07:00
parent 7b797e3bb5 bdd8dd7d1f
commit 9de8564192
2 changed files with 7 additions and 0 deletions
--- a/ndk/platforms/android-9/include/android/asset_manager.h
+++ b/ndk/platforms/android-9/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
--- a/ndk/platforms/android-9/include/android/rect.h
+++ b/ndk/platforms/android-9/include/android/rect.h
@@ -18,11 +18,16 @@
 #ifndef ANDROID_RECT_H
 #define ANDROID_RECT_H

+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

 typedef struct ARect {
+#ifdef __cplusplus
+    typedef int32_t value_type;
+#endif
    int32_t left;
    int32_t top;
    int32_t right;