[gnutls-devel] [PATCH V2 1/4] updated gnulib

[Kevin Cernekee]

This pulls in upstream commit cb3c90598 (stdint, read-file: fix missing
SIZE_MAX on Android).

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
 src/gl/stdint.in.h    | 3 +--
 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 5deca39..247f0d8 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 d3a4be1..deb5d67 100644
--- a/src/gl/sys_types.in.h
+++ b/src/gl/sys_types.in.h
@@ -23,7 +23,9 @@
 #ifndef _ at 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 _ at GUARD_PREFIX@_SYS_TYPES_H
 #define _ at GUARD_PREFIX@_SYS_TYPES_H
-- 
1.8.3.2