LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed asset_manager.h, rect_manager.h, and jni.h

Browse Source 
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
This commit is contained in:
Andrew Hsieh
2014-01-08 14:10:06 +08:00
parent 365e66feaf
commit fbb32955a4
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-13/include/android/asset_manager.h
View File

@@ -18,6 +18,8 @@
#ifndef ANDROID_ASSET_MANAGER_H #ifndef ANDROID_ASSET_MANAGER_H
#define ANDROID_ASSET_MANAGER_H #define ANDROID_ASSET_MANAGER_H
#include <sys/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

2
ndk/platforms/android-14/include/android/rect.h
View File

@@ -18,6 +18,8 @@
#ifndef ANDROID_RECT_H #ifndef ANDROID_RECT_H
#define ANDROID_RECT_H #define ANDROID_RECT_H
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

4
ndk/platforms/android-3/include/jni.h
View File

@@ -1144,8 +1144,8 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
* Prototypes for functions exported by loadable shared libs. These are * Prototypes for functions exported by loadable shared libs. These are
* called by JNI, not provided by JNI. * called by JNI, not provided by JNI.
*/ */
JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved); JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved);
JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved); JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved);
#ifdef __cplusplus #ifdef __cplusplus
} }