From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 Jan 2012 11:22:41 +0000 (+0100)
Subject: stdint: Improve support for Android.
X-Git-Tag: v0.1~1217
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=98716b76d5f78e8ea0670b841ca470dffefb53d9;p=gnulib.git

stdint: Improve support for Android.

* lib/stdint.in.h: Test __ANDROID__, not __BIONIC__.
Reported by Simon Josefsson <simon@josefsson.org>.
---

diff --git a/ChangeLog b/ChangeLog
index 5eff0181b..179ceddd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 591371c61..1d0759e59 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -36,8 +36,10 @@
 
 /* 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
@@ -614,5 +616,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 #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 */