]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
updated gnulib
authorKevin Cernekee <cernekee@gmail.com>
Sat, 8 Mar 2014 04:38:27 +0000 (20:38 -0800)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 8 Mar 2014 08:44:49 +0000 (09:44 +0100)
This pulls in upstream commit cb3c90598 (stdint, read-file: fix missing
SIZE_MAX on Android).

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
src/gl/stdint.in.h
src/gl/sys_types.in.h

index 5deca3969abc41631df7b47a48d647e5e2b77653..247f0d89619fd5f69f5e8f97ae3aa42a6c07f319 100644 (file)
@@ -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
 
index d3a4be1074aa8e930e14dffd56d86ff68733f329..deb5d67d1d7d2d8a573984911bfc89ea24dbe192 100644 (file)
@@ -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