diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-01-24 12:22:41 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-01-24 12:22:41 +0100 |
| commit | 98716b76d5f78e8ea0670b841ca470dffefb53d9 (patch) | |
| tree | c3cf0af2e2b6985a593a871ea5c216491a3ac0a8 | |
| parent | d4bb8e53138f9909384115e27f18e9f047bdc9f3 (diff) | |
| download | gnulib-98716b76d5f78e8ea0670b841ca470dffefb53d9.tar.gz | |
stdint: Improve support for Android.
* lib/stdint.in.h: Test __ANDROID__, not __BIONIC__.
Reported by Simon Josefsson <simon@josefsson.org>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/stdint.in.h | 8 |
2 files changed, 11 insertions, 3 deletions
@@ -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 591371c614..1d0759e59d 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 */ |