From 10795d840b0991fd6150475803610b125d4ea262 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 28 Oct 2010 17:39:11 -0700 Subject: [PATCH 1/2] Declare localeconv() in The function is not implemented by our C library, but it is not possible to build GNU libstdc++-v3 if the declaration is not part of this header. Change-Id: Iff6fa63465dde0d4e38c0f91709475bb35b31af9 --- ndk/platforms/android-3/include/locale.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ndk/platforms/android-3/include/locale.h b/ndk/platforms/android-3/include/locale.h index df4292172..4259ddda7 100644 --- a/ndk/platforms/android-3/include/locale.h +++ b/ndk/platforms/android-3/include/locale.h @@ -51,9 +51,8 @@ enum { extern char *setlocale(int category, const char *locale); -/* Make libstdc++-v3 happy. */ +#if 1 /* MISSING FROM BIONIC - DEFINED TO MAKE libstdc++-v3 happy */ struct lconv { }; -#if 0 /* MISSING FROM BIONIC */ struct lconv *localeconv(void); #endif /* MISSING */ From 3323f5912cec801061cb9cd61e03b9604dec27a2 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 1 Nov 2010 14:30:30 -0700 Subject: [PATCH 2/2] update native_window.h ndk header Change-Id: I70178a1ddd94279a102c2d25d2ce0459cec9d13a --- ndk/platforms/android-9/include/android/native_window.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndk/platforms/android-9/include/android/native_window.h b/ndk/platforms/android-9/include/android/native_window.h index ad03d0e93..f3d75507c 100644 --- a/ndk/platforms/android-9/include/android/native_window.h +++ b/ndk/platforms/android-9/include/android/native_window.h @@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window); * For all of these parameters, if 0 is supplied then the window's base * value will come back in force. */ -int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height); +int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height, int32_t format); /** * Lock the window's next drawing surface for writing.