From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Tue, 15 Jan 2013 10:41:52 +0000 (+0100)
Subject: stdint: fix build with Android's Bionic fox x86
X-Git-Tag: v0.1~245
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=1e3c93f9fcf473eaaf772a352c4db0e59b9f1ea4;p=gnulib.git

stdint: fix build with Android's Bionic fox x86

* lib/stdint.in.h: fix check to test if included-fixed/sys/types.h
was already included as _SSIZE_T_DEFINED_ might also be defined
in include/machine/_types.h, which is included by stdio.h

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 7cb6f9777..79defc9a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-15  Andoni Morales Alastruey  <ylatuya@gmail.com>  (tiny change)
+
+	stdint: fix build with Android's Bionic fox x86
+	* lib/stdint.in.h: fix check to test if included-fixed/sys/types.h
+	was already included as _SSIZE_T_DEFINED_ might also be defined
+	in include/machine/_types.h, which is included by stdio.h
+
 2013-01-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	net_if-tests: port to Solaris 7 + GCC 3.4.6
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index e1108c542..18960157a 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -39,7 +39,7 @@
    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_
+    && defined _SYS_TYPES_H_ && !defined __need_size_t
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else