  typedef struct { int  dummy; }  mbstate_t;
  
 
+***************
+*** 71,78 ****
+--- 71,82 ----
+      WC_TYPE_MAX
+  } wctype_t;
+  
++ #ifndef WCHAR_MAX
+  #define  WCHAR_MAX   255
++ #endif
++ #ifndef WCHAR_MIN
+  #define  WCHAR_MIN   0
++ #endif
+  #define  WEOF        (-1)
+  
+  extern wint_t            btowc(int);
+
+*** android-ndk-r3/build/platforms/android-4/arch-arm/usr/include/stdint.h	Fri Jan  8 10:14:48 2010
+--- android-ndk-r3/build/platforms/android-4/arch-arm/usr/include/stdint.h	Wed Apr 14 08:46:20 2010
+***************
+*** 251,256 ****
+--- 251,263 ----
+  
+  #endif /* !__STDC_INT64__ */
+  
++ /* Also defined in wchar.h */
++ #ifndef WCHAR_MAX
++ #define  WCHAR_MAX   255
++ #endif
++ #ifndef WCHAR_MIN
++ #define  WCHAR_MIN   0
++ #endif
+  
+  /* size_t is defined by the GCC-specific <stddef.h> */
+  #ifndef _SSIZE_T_DEFINED_
+

diff -ru arch-arm/usr/include/pthread.h sysroot-1.5/usr/include/pthread.h
--- android-ndk-1.6_r1/build/platforms/android-4/arch-arm/usr/include/pthread.h	2009-07-29 10:26:01.000000000 +1000
+++ android-ndk-1.6_r1/build/platforms/android-4/arch-arm/usr/include/pthread.h	2009-05-06 22:14:18.000000000 +1000
@@ -197,6 +197,9 @@

 int pthread_once(pthread_once_t  *once_control, void (*init_routine)(void));
 
 typedef void  (*__pthread_cleanup_func_t)(void*);
--- android-ndk-1.6_r1/build/platforms/android-4/arch-arm/usr/include/sys/types.h	2009-07-29 10:26:01.000000000 +1000
+++ android-ndk-1.6_r1/build/platforms/android-4/arch-arm/usr/include/sys/types.h	2009-05-06 08:22:14.000000000 +1000
@@ -119,7 +119,9 @@
