diff options
| author | Kevin Cernekee <cernekee@gmail.com> | 2014-03-05 12:10:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-05 17:48:19 -0800 |
| commit | cb3c90598c13d3db616c0c1e62c5d59ed80b069d (patch) | |
| tree | e54d394b1a12bdb7377bb699e93d9ee29902db62 /lib | |
| parent | a10acfb1d2118f9a180181d3fed5399dbbe1df3c (diff) | |
| download | gnulib-cb3c90598c13d3db616c0c1e62c5d59ed80b069d.tar.gz | |
stdint, read-file: fix missing SIZE_MAX on Android (tiny change)
This is basically one of the options Bruno Haible proposed in:
http://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00282.html
* lib/sys_types.in.h (_GL_INCLUDING_UNISTD_H): New macro.
* lib/stdint.in.h: Use it.
* modules/stdint (Depends-on): Add sys_types.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdint.in.h | 3 | ||||
| -rw-r--r-- | lib/sys_types.in.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 91fad37d65..98ee423b18 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -38,8 +38,7 @@ 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 __need_size_t +#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 803d7b19a4..b3bf9f2092 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -23,7 +23,9 @@ #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ +# define _GL_INCLUDING_SYS_TYPES_H #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ +# undef _GL_INCLUDING_SYS_TYPES_H #ifndef _@GUARD_PREFIX@_SYS_TYPES_H #define _@GUARD_PREFIX@_SYS_TYPES_H |