diff options
Diffstat (limited to '9/platforms/android-14/arch-arm')
16 files changed, 253 insertions, 13 deletions
diff --git a/9/platforms/android-14/arch-arm/usr/include/EGL/eglext.h b/9/platforms/android-14/arch-arm/usr/include/EGL/eglext.h index a08932a..7b6ed1b 100644 --- a/9/platforms/android-14/arch-arm/usr/include/EGL/eglext.h +++ b/9/platforms/android-14/arch-arm/usr/include/EGL/eglext.h @@ -28,7 +28,7 @@ extern "C" { ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. */ -#include <EGL/eglplatform.h> +#include <EGL/egl.h> /*************************************************************/ diff --git a/9/platforms/android-14/arch-arm/usr/include/GLES/glext.h b/9/platforms/android-14/arch-arm/usr/include/GLES/glext.h index 65ab5e4..015165f 100644 --- a/9/platforms/android-14/arch-arm/usr/include/GLES/glext.h +++ b/9/platforms/android-14/arch-arm/usr/include/GLES/glext.h @@ -3,6 +3,8 @@ /* $Revision: 10965 $ on $Date:: 2010-04-09 02:11:29 -0700 #$ */ +#include <GLES/gl.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/9/platforms/android-14/arch-arm/usr/include/GLES2/gl2ext.h b/9/platforms/android-14/arch-arm/usr/include/GLES2/gl2ext.h index 9db4e25..793e0c2 100644 --- a/9/platforms/android-14/arch-arm/usr/include/GLES2/gl2ext.h +++ b/9/platforms/android-14/arch-arm/usr/include/GLES2/gl2ext.h @@ -3,6 +3,8 @@ /* $Revision: 10969 $ on $Date:: 2010-04-09 02:27:15 -0700 #$ */ +#include <GLES2/gl2.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/9/platforms/android-14/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-14/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h index 10f36f4..7c9bba5 100644 --- a/9/platforms/android-14/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h +++ b/9/platforms/android-14/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h @@ -21,6 +21,8 @@ extern "C" { #endif +#include "OpenMAXAL.h" + /*---------------------------------------------------------------------------*/ /* Android common types */ /*---------------------------------------------------------------------------*/ diff --git a/9/platforms/android-14/arch-arm/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-14/arch-arm/usr/include/SLES/OpenSLES_Android.h index f295518..4d8f656 100644 --- a/9/platforms/android-14/arch-arm/usr/include/SLES/OpenSLES_Android.h +++ b/9/platforms/android-14/arch-arm/usr/include/SLES/OpenSLES_Android.h @@ -24,6 +24,8 @@ extern "C" { #endif +#include "OpenSLES.h" + /*---------------------------------------------------------------------------*/ /* Android common types */ /*---------------------------------------------------------------------------*/ diff --git a/9/platforms/android-14/arch-arm/usr/include/android/asset_manager.h b/9/platforms/android-14/arch-arm/usr/include/android/asset_manager.h index f5df46b..6ac350e 100644 --- a/9/platforms/android-14/arch-arm/usr/include/android/asset_manager.h +++ b/9/platforms/android-14/arch-arm/usr/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/9/platforms/android-14/arch-arm/usr/include/android/looper.h b/9/platforms/android-14/arch-arm/usr/include/android/looper.h index 24e3967..74c0383 100644 --- a/9/platforms/android-14/arch-arm/usr/include/android/looper.h +++ b/9/platforms/android-14/arch-arm/usr/include/android/looper.h @@ -253,4 +253,4 @@ int ALooper_removeFd(ALooper* looper, int fd); }; #endif -#endif // ANDROID_NATIVE_WINDOW_H +#endif // ANDROID_LOOPER_H diff --git a/9/platforms/android-14/arch-arm/usr/include/android/rect.h b/9/platforms/android-14/arch-arm/usr/include/android/rect.h index 64d487d..bcd42a9 100644 --- a/9/platforms/android-14/arch-arm/usr/include/android/rect.h +++ b/9/platforms/android-14/arch-arm/usr/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/9/platforms/android-14/arch-arm/usr/include/android/tts.h b/9/platforms/android-14/arch-arm/usr/include/android/tts.h index fb15108..946498e 100644 --- a/9/platforms/android-14/arch-arm/usr/include/android/tts.h +++ b/9/platforms/android-14/arch-arm/usr/include/android/tts.h @@ -28,6 +28,8 @@ extern "C" { #endif +#include <stdint.h> + #define ANDROID_TTS_ENGINE_PROPERTY_CONFIG "engineConfig" #define ANDROID_TTS_ENGINE_PROPERTY_PITCH "pitch" #define ANDROID_TTS_ENGINE_PROPERTY_RATE "rate" @@ -90,7 +92,7 @@ extern android_tts_engine_t *android_getTtsEngine(); /* Including the old version for legacy support (Froyo compatibility). * This should return the same thing as android_getTtsEngine. */ -extern "C" android_tts_engine_t *getTtsEngine(); +android_tts_engine_t *getTtsEngine(); // A callback type used to notify the framework of new synthetized // audio samples, status will be SYNTH_DONE for the last sample of diff --git a/9/platforms/android-14/arch-arm/usr/include/fts.h b/9/platforms/android-14/arch-arm/usr/include/fts.h index da26a88..d18fc2c 100644 --- a/9/platforms/android-14/arch-arm/usr/include/fts.h +++ b/9/platforms/android-14/arch-arm/usr/include/fts.h @@ -35,6 +35,8 @@ #ifndef _FTS_H_ #define _FTS_H_ +#include <sys/types.h> + typedef struct { struct _ftsent *fts_cur; /* current node */ struct _ftsent *fts_child; /* linked list of children */ diff --git a/9/platforms/android-14/arch-arm/usr/include/jni.h b/9/platforms/android-14/arch-arm/usr/include/jni.h index 21ad370..f36398f 100644 --- a/9/platforms/android-14/arch-arm/usr/include/jni.h +++ b/9/platforms/android-14/arch-arm/usr/include/jni.h @@ -1138,14 +1138,14 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*); #define JNIIMPORT #define JNIEXPORT __attribute__ ((visibility ("default"))) -#define JNICALL +#define JNICALL __NDK_FPABI__ /* * 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 } diff --git a/9/platforms/android-14/arch-arm/usr/include/math.h b/9/platforms/android-14/arch-arm/usr/include/math.h index e46cf46..408f262 100644 --- a/9/platforms/android-14/arch-arm/usr/include/math.h +++ b/9/platforms/android-14/arch-arm/usr/include/math.h @@ -492,6 +492,220 @@ void sincosf(float x, float *sin, float *cos) __NDK_FPABI_MATH__; void sincosl(long double x, long double *sin, long double *cos) __NDK_FPABI_MATH__; #endif +/* builtin version of all the above math functions are annotated too */ + +double __builtin_acos(double) __NDK_FPABI_MATH__; +double __builtin_asin(double) __NDK_FPABI_MATH__; +double __builtin_atan(double) __NDK_FPABI_MATH__; +double __builtin_atan2(double, double) __NDK_FPABI_MATH__; +double __builtin_cos(double) __NDK_FPABI_MATH__; +double __builtin_sin(double) __NDK_FPABI_MATH__; +double __builtin_tan(double) __NDK_FPABI_MATH__; +double __builtin_cosh(double) __NDK_FPABI_MATH__; +double __builtin_sinh(double) __NDK_FPABI_MATH__; +double __builtin_tanh(double) __NDK_FPABI_MATH__; +double __builtin_exp(double) __NDK_FPABI_MATH__; +double __builtin_frexp(double, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +double __builtin_ldexp(double, int) __NDK_FPABI_MATH__; +double __builtin_log(double) __NDK_FPABI_MATH__; +double __builtin_log10(double) __NDK_FPABI_MATH__; +double __builtin_modf(double, double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +double __builtin_pow(double, double) __NDK_FPABI_MATH__; +double __builtin_sqrt(double) __NDK_FPABI_MATH__; +double __builtin_ceil(double) __NDK_FPABI_MATH__; +double __builtin_fabs(double) __NDK_FPABI_MATH__ __pure2; +double __builtin_floor(double) __NDK_FPABI_MATH__; +double __builtin_fmod(double, double) __NDK_FPABI_MATH__; +double __builtin_acosh(double) __NDK_FPABI_MATH__; +double __builtin_asinh(double) __NDK_FPABI_MATH__; +double __builtin_atanh(double) __NDK_FPABI_MATH__; +double __builtin_cbrt(double) __NDK_FPABI_MATH__; +double __builtin_erf(double) __NDK_FPABI_MATH__; +double __builtin_erfc(double) __NDK_FPABI_MATH__; +double __builtin_exp2(double) __NDK_FPABI_MATH__; +double __builtin_expm1(double) __NDK_FPABI_MATH__; +double __builtin_fma(double, double, double) __NDK_FPABI_MATH__; +double __builtin_hypot(double, double) __NDK_FPABI_MATH__; +int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; +/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) +int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; +#else +/* clang < 3.5 has faulty prototype for __builtin_isnan */ +#endif +double __builtin_lgamma(double) __NDK_FPABI_MATH__; +long long __builtin_llrint(double) __NDK_FPABI_MATH__; +long long __builtin_llround(double) __NDK_FPABI_MATH__; +double __builtin_log1p(double) __NDK_FPABI_MATH__; +double __builtin_logb(double) __NDK_FPABI_MATH__; +long __builtin_lrint(double) __NDK_FPABI_MATH__; +long __builtin_lround(double) __NDK_FPABI_MATH__; +double __builtin_nan(const char *) __NDK_FPABI_MATH__ __pure2; +double __builtin_nextafter(double, double) __NDK_FPABI_MATH__; +double __builtin_remainder(double, double) __NDK_FPABI_MATH__; +double __builtin_remquo(double, double, int *) __NDK_FPABI_MATH__; +double __builtin_rint(double) __NDK_FPABI_MATH__; +double __builtin_j0(double) __NDK_FPABI_MATH__; +double __builtin_j1(double) __NDK_FPABI_MATH__; +double __builtin_jn(int, double) __NDK_FPABI_MATH__; +double __builtin_scalb(double, double) __NDK_FPABI_MATH__; +double __builtin_y0(double) __NDK_FPABI_MATH__; +double __builtin_y1(double) __NDK_FPABI_MATH__; +double __builtin_yn(int, double) __NDK_FPABI_MATH__; +double __builtin_gamma(double) __NDK_FPABI_MATH__; +double __builtin_copysign(double, double) __NDK_FPABI_MATH__ __pure2; +double __builtin_fdim(double, double) __NDK_FPABI_MATH__; +double __builtin_fmax(double, double) __NDK_FPABI_MATH__ __pure2; +double __builtin_fmin(double, double) __NDK_FPABI_MATH__ __pure2; +double __builtin_nearbyint(double) __NDK_FPABI_MATH__; +double __builtin_round(double) __NDK_FPABI_MATH__; +double __builtin_scalbln(double, long) __NDK_FPABI_MATH__; +double __builtin_scalbn(double, int) __NDK_FPABI_MATH__; +double __builtin_tgamma(double) __NDK_FPABI_MATH__; +double __builtin_trunc(double) __NDK_FPABI_MATH__; +double __builtin_drem(double, double) __NDK_FPABI_MATH__; +int __builtin_finite(double) __NDK_FPABI_MATH__ __pure2; +int __builtin_isnanf(float) __NDK_FPABI_MATH__ __pure2; +double __builtin_gamma_r(double, int *) __NDK_FPABI_MATH__; +double __builtin_lgamma_r(double, int *) __NDK_FPABI_MATH__; +double __builtin_significand(double) __NDK_FPABI_MATH__; +float __builtin_acosf(float) __NDK_FPABI_MATH__; +float __builtin_asinf(float) __NDK_FPABI_MATH__; +float __builtin_atanf(float) __NDK_FPABI_MATH__; +float __builtin_atan2f(float, float) __NDK_FPABI_MATH__; +float __builtin_cosf(float) __NDK_FPABI_MATH__; +float __builtin_sinf(float) __NDK_FPABI_MATH__; +float __builtin_tanf(float) __NDK_FPABI_MATH__; +float __builtin_coshf(float) __NDK_FPABI_MATH__; +float __builtin_sinhf(float) __NDK_FPABI_MATH__; +float __builtin_tanhf(float) __NDK_FPABI_MATH__; +float __builtin_exp2f(float) __NDK_FPABI_MATH__; +float __builtin_expf(float) __NDK_FPABI_MATH__; +float __builtin_expm1f(float) __NDK_FPABI_MATH__; +float __builtin_frexpf(float, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +int __builtin_ilogbf(float) __NDK_FPABI_MATH__ __pure2; +float __builtin_ldexpf(float, int) __NDK_FPABI_MATH__; +float __builtin_log10f(float) __NDK_FPABI_MATH__; +float __builtin_log1pf(float) __NDK_FPABI_MATH__; +float __builtin_logf(float) __NDK_FPABI_MATH__; +float __builtin_modff(float, float *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +float __builtin_powf(float, float) __NDK_FPABI_MATH__; +float __builtin_sqrtf(float) __NDK_FPABI_MATH__; +float __builtin_ceilf(float) __NDK_FPABI_MATH__; +float __builtin_fabsf(float) __NDK_FPABI_MATH__ __pure2; +float __builtin_floorf(float) __NDK_FPABI_MATH__; +float __builtin_fmodf(float, float) __NDK_FPABI_MATH__; +float __builtin_roundf(float) __NDK_FPABI_MATH__; +float __builtin_erff(float) __NDK_FPABI_MATH__; +float __builtin_erfcf(float) __NDK_FPABI_MATH__; +float __builtin_hypotf(float, float) __NDK_FPABI_MATH__; +float __builtin_lgammaf(float) __NDK_FPABI_MATH__; +float __builtin_tgammaf(float) __NDK_FPABI_MATH__; +float __builtin_acoshf(float) __NDK_FPABI_MATH__; +float __builtin_asinhf(float) __NDK_FPABI_MATH__; +float __builtin_atanhf(float) __NDK_FPABI_MATH__; +float __builtin_cbrtf(float) __NDK_FPABI_MATH__; +float __builtin_logbf(float) __NDK_FPABI_MATH__; +float __builtin_copysignf(float, float) __NDK_FPABI_MATH__ __pure2; +long long __builtin_llrintf(float) __NDK_FPABI_MATH__; +long long __builtin_llroundf(float) __NDK_FPABI_MATH__; +long __builtin_lrintf(float) __NDK_FPABI_MATH__; +long __builtin_lroundf(float) __NDK_FPABI_MATH__; +float __builtin_nanf(const char *) __NDK_FPABI_MATH__ __pure2; +float __builtin_nearbyintf(float) __NDK_FPABI_MATH__; +float __builtin_nextafterf(float, float) __NDK_FPABI_MATH__; +float __builtin_remainderf(float, float) __NDK_FPABI_MATH__; +float __builtin_remquof(float, float, int *) __NDK_FPABI_MATH__; +float __builtin_rintf(float) __NDK_FPABI_MATH__; +float __builtin_scalblnf(float, long) __NDK_FPABI_MATH__; +float __builtin_scalbnf(float, int) __NDK_FPABI_MATH__; +float __builtin_truncf(float) __NDK_FPABI_MATH__; +float __builtin_fdimf(float, float) __NDK_FPABI_MATH__; +float __builtin_fmaf(float, float, float) __NDK_FPABI_MATH__; +float __builtin_fmaxf(float, float) __NDK_FPABI_MATH__ __pure2; +float __builtin_fminf(float, float) __NDK_FPABI_MATH__ __pure2; +float __builtin_dremf(float, float) __NDK_FPABI_MATH__; +int __builtin_finitef(float) __NDK_FPABI_MATH__ __pure2; +float __builtin_gammaf(float) __NDK_FPABI_MATH__; +float __builtin_j0f(float) __NDK_FPABI_MATH__; +float __builtin_j1f(float) __NDK_FPABI_MATH__; +float __builtin_jnf(int, float) __NDK_FPABI_MATH__; +float __builtin_scalbf(float, float) __NDK_FPABI_MATH__; +float __builtin_y0f(float) __NDK_FPABI_MATH__; +float __builtin_y1f(float) __NDK_FPABI_MATH__; +float __builtin_ynf(int, float) __NDK_FPABI_MATH__; +float __builtin_gammaf_r(float, int *) __NDK_FPABI_MATH__; +float __builtin_lgammaf_r(float, int *) __NDK_FPABI_MATH__; +float __builtin_significandf(float) __NDK_FPABI_MATH__; +long double __builtin_acoshl(long double) __NDK_FPABI_MATH__; +long double __builtin_acosl(long double) __NDK_FPABI_MATH__; +long double __builtin_asinhl(long double) __NDK_FPABI_MATH__; +long double __builtin_asinl(long double) __NDK_FPABI_MATH__; +long double __builtin_atan2l(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_atanhl(long double) __NDK_FPABI_MATH__; +long double __builtin_atanl(long double) __NDK_FPABI_MATH__; +long double __builtin_cbrtl(long double) __NDK_FPABI_MATH__; +long double __builtin_ceill(long double) __NDK_FPABI_MATH__; +long double __builtin_copysignl(long double, long double) __NDK_FPABI_MATH__ __pure2; +long double __builtin_coshl(long double) __NDK_FPABI_MATH__; +long double __builtin_cosl(long double) __NDK_FPABI_MATH__; +long double __builtin_erfcl(long double) __NDK_FPABI_MATH__; +long double __builtin_erfl(long double) __NDK_FPABI_MATH__; +long double __builtin_exp2l(long double) __NDK_FPABI_MATH__; +long double __builtin_expl(long double) __NDK_FPABI_MATH__; +long double __builtin_expm1l(long double) __NDK_FPABI_MATH__; +long double __builtin_fabsl(long double) __NDK_FPABI_MATH__ __pure2; +long double __builtin_fdiml(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_floorl(long double) __NDK_FPABI_MATH__; +long double __builtin_fmal(long double, long double, long double) __NDK_FPABI_MATH__; +long double __builtin_fmaxl(long double, long double) __NDK_FPABI_MATH__ __pure2; +long double __builtin_fminl(long double, long double) __NDK_FPABI_MATH__ __pure2; +long double __builtin_fmodl(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_frexpl(long double value, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +long double __builtin_hypotl(long double, long double) __NDK_FPABI_MATH__; +int __builtin_ilogbl(long double) __NDK_FPABI_MATH__ __pure2; +long double __builtin_ldexpl(long double, int) __NDK_FPABI_MATH__; +long double __builtin_lgammal(long double) __NDK_FPABI_MATH__; +long long __builtin_llrintl(long double) __NDK_FPABI_MATH__; +long long __builtin_llroundl(long double) __NDK_FPABI_MATH__; +long double __builtin_log10l(long double) __NDK_FPABI_MATH__; +long double __builtin_log1pl(long double) __NDK_FPABI_MATH__; +long double __builtin_log2l(long double) __NDK_FPABI_MATH__; +long double __builtin_logbl(long double) __NDK_FPABI_MATH__; +long double __builtin_logl(long double) __NDK_FPABI_MATH__; +long __builtin_lrintl(long double) __NDK_FPABI_MATH__; +long __builtin_lroundl(long double) __NDK_FPABI_MATH__; +long double __builtin_modfl(long double, long double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */ +long double __builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2; +long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__; +long double __builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__; +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) +double __builtin_nexttoward(double, long double) __NDK_FPABI_MATH__; +float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__; +#else +/* clang < 3.4 */ +double __builtin_nexttoward(double, double) __NDK_FPABI_MATH__; +float __builtin_nexttowardf(float, float) __NDK_FPABI_MATH__; +#endif +long double __builtin_nexttowardl(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_powl(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_remainderl(long double, long double) __NDK_FPABI_MATH__; +long double __builtin_remquol(long double, long double, int *) __NDK_FPABI_MATH__; +long double __builtin_rintl(long double) __NDK_FPABI_MATH__; +long double __builtin_roundl(long double) __NDK_FPABI_MATH__; +long double __builtin_scalblnl(long double, long) __NDK_FPABI_MATH__; +long double __builtin_scalbnl(long double, int) __NDK_FPABI_MATH__; +long double __builtin_sinhl(long double) __NDK_FPABI_MATH__; +long double __builtin_sinl(long double) __NDK_FPABI_MATH__; +long double __builtin_sqrtl(long double) __NDK_FPABI_MATH__; +long double __builtin_tanhl(long double) __NDK_FPABI_MATH__; +long double __builtin_tanl(long double) __NDK_FPABI_MATH__; +long double __builtin_tgammal(long double) __NDK_FPABI_MATH__; +long double __builtin_truncl(long double) __NDK_FPABI_MATH__; +void __builtin_sincos(double x, double *sin, double *cos) __NDK_FPABI_MATH__; +void __builtin_sincosf(float x, float *sin, float *cos) __NDK_FPABI_MATH__; +void __builtin_sincosl(long double x, long double *sin, long double *cos) __NDK_FPABI_MATH__; + /* #endif */ /* __ISO_C_VISIBLE >= 1999 */ __END_DECLS diff --git a/9/platforms/android-14/arch-arm/usr/include/sys/prctl.h b/9/platforms/android-14/arch-arm/usr/include/sys/prctl.h index 359d684..00e5837 100644 --- a/9/platforms/android-14/arch-arm/usr/include/sys/prctl.h +++ b/9/platforms/android-14/arch-arm/usr/include/sys/prctl.h @@ -29,6 +29,7 @@ #define _SYS_PRCTL_H #include <linux/prctl.h> +#include <sys/cdefs.h> __BEGIN_DECLS diff --git a/9/platforms/android-14/arch-arm/usr/include/sys/utime.h b/9/platforms/android-14/arch-arm/usr/include/sys/utime.h index 9f8810e..918d153 100644 --- a/9/platforms/android-14/arch-arm/usr/include/sys/utime.h +++ b/9/platforms/android-14/arch-arm/usr/include/sys/utime.h @@ -28,6 +28,7 @@ #ifndef _SYS_UTIME_H_ #define _SYS_UTIME_H_ +#include <sys/types.h> #include <linux/utime.h> #endif /* _SYS_UTIME_H_ */ diff --git a/9/platforms/android-14/arch-arm/usr/include/sys/wait.h b/9/platforms/android-14/arch-arm/usr/include/sys/wait.h index da29734..51e070b 100644 --- a/9/platforms/android-14/arch-arm/usr/include/sys/wait.h +++ b/9/platforms/android-14/arch-arm/usr/include/sys/wait.h @@ -33,6 +33,9 @@ #include <sys/resource.h> #include <linux/wait.h> #include <signal.h> +#include <asm/unistd.h> +#include <sys/syscall.h> + __BEGIN_DECLS @@ -48,10 +51,9 @@ __BEGIN_DECLS extern pid_t wait(int *); extern pid_t waitpid(pid_t, int *, int); extern pid_t wait3(int *, int, struct rusage *); -static __inline__ pid_t wait4(pid_t p, int *s, int o, struct rusage *r) +static __inline__ pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage) { - extern pid_t __wait4(pid_t, int *, int, struct rusage *); - return __wait4(p,s,o,r); + return (pid_t)syscall(__NR_wait4, pid, status, options, rusage); } /* Posix states that idtype_t should be an enumeration type, but diff --git a/9/platforms/android-14/arch-arm/usr/include/time.h b/9/platforms/android-14/arch-arm/usr/include/time.h index e7ead0f..38e89fd 100644 --- a/9/platforms/android-14/arch-arm/usr/include/time.h +++ b/9/platforms/android-14/arch-arm/usr/include/time.h @@ -94,15 +94,21 @@ extern long int timezone; extern clock_t clock(void); /* BIONIC: extra linux clock goodies */ -extern int clock_getres(int, struct timespec *); -extern int clock_gettime(int, struct timespec *); +extern int clock_getres(clockid_t, struct timespec *); +extern int clock_gettime(clockid_t, struct timespec *); +extern int clock_settime(clockid_t, const struct timespec *); +extern int clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *); #define CLOCK_REALTIME 0 #define CLOCK_MONOTONIC 1 #define CLOCK_PROCESS_CPUTIME_ID 2 #define CLOCK_THREAD_CPUTIME_ID 3 -#define CLOCK_REALTIME_HR 4 -#define CLOCK_MONOTONIC_HR 5 +#define CLOCK_MONOTONIC_RAW 4 +#define CLOCK_REALTIME_COARSE 5 +#define CLOCK_MONOTONIC_COARSE 6 +#define CLOCK_BOOTTIME 7 +#define CLOCK_REALTIME_ALARM 8 +#define CLOCK_BOOTTIME_ALARM 9 extern int timer_create(int, struct sigevent*, timer_t*); extern int timer_delete(timer_t); |