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

Merge branch 'gingerbread' into gingerbread-release

Browse Source
This commit is contained in:
The Android Automerger
2010-11-03 02:52:17 -07:00
parent a7e04ad16c fc187b1e3a
commit a51691f590
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ndk/platforms/android-3/include/locale.h
View File

@@ -51,9 +51,8 @@ enum {
extern char *setlocale(int category, const char *locale); 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 { }; struct lconv { };
#if 0 /* MISSING FROM BIONIC */
struct lconv *localeconv(void); struct lconv *localeconv(void);
#endif /* MISSING */ #endif /* MISSING */

2
ndk/platforms/android-9/include/android/native_window.h
View File

@@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window);
* For all of these parameters, if 0 is supplied then the window's base * For all of these parameters, if 0 is supplied then the window's base
* value will come back in force. * 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. * Lock the window's next drawing surface for writing.