+2012-01-24 Bruno Haible <bruno@clisp.org>
+
+ stdint: Improve support for Android.
+ * lib/stdint.in.h: Test __ANDROID__, not __BIONIC__.
+ Reported by Simon Josefsson <simon@josefsson.org>.
+
2012-01-23 Paul Eggert <eggert@cs.ucla.edu>
doc: omit trailing empty lines from INSTALL etc.
/* On Android (Bionic libc), <sys/types.h> includes this file before
having defined 'time_t'. Therefore in this case avoid including
- other system header files; just include the system's <stdint.h>. */
-#if defined __BIONIC__ \
+ other system header files; just include the system's <stdint.h>.
+ Ideally we should test __BIONIC__ here, but it is only defined after
+ <sys/cdefs.h> has been included; hence test __ANDROID__ instead. */
+#if defined __ANDROID__ \
&& defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
# @INCLUDE_NEXT@ @NEXT_STDINT_H@
#else
#endif
#endif /* _@GUARD_PREFIX@_STDINT_H */
-#endif /* !(defined __BIONIC__ && ...) */
+#endif /* !(defined __ANDROID__ && ...) */
#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */