Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16309:90fd844fe314
stdint: Improve support for Android.
* lib/stdint.in.h: Test __ANDROID__, not __BIONIC__.
Reported by Simon Josefsson <simon@josefsson.org>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 24 Jan 2012 12:22:41 +0100 |
| parents | 6a9ab4fadad6 |
| children | 76d618058a2b |
| files | ChangeLog lib/stdint.in.h |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 @@ #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 */