diff options
| author | Kevin Cernekee <cernekee@gmail.com> | 2014-03-07 20:38:27 -0800 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-03-08 09:44:49 +0100 |
| commit | f935d9f5cf1d294b352f783cda69099df33a3b79 (patch) | |
| tree | 7b027dc85a6a9b5bd6f5613d264f0ef9c2c9b958 /src/gl | |
| parent | 52db013ae14cd9eb46ec76fb5b3ddb53dc0ab473 (diff) | |
| download | gnutls-f935d9f5cf1d294b352f783cda69099df33a3b79.tar.gz | |
updated gnulib
This pulls in upstream commit cb3c90598 (stdint, read-file: fix missing
SIZE_MAX on Android).
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Diffstat (limited to 'src/gl')
| -rw-r--r-- | src/gl/stdint.in.h | 3 | ||||
| -rw-r--r-- | src/gl/sys_types.in.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gl/stdint.in.h b/src/gl/stdint.in.h index 5deca3969a..247f0d8961 100644 --- a/src/gl/stdint.in.h +++ b/src/gl/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/src/gl/sys_types.in.h b/src/gl/sys_types.in.h index d3a4be1074..deb5d67d1d 100644 --- a/src/gl/sys_types.in.h +++ b/src/gl/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 |