From 905d2f40ea0af606e01ed32ff981a772dc548c12 Mon Sep 17 00:00:00 2001 From: Edouard Tisserant Date: Fri, 9 Oct 2015 22:16:02 +0200 Subject: [PATCH] Android : add files ignored in prefious commit --- .../gnupg_fix_gmulib_stdint_with_bionic.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 android/external/gnupg_fix_gmulib_stdint_with_bionic.patch diff --git a/android/external/gnupg_fix_gmulib_stdint_with_bionic.patch b/android/external/gnupg_fix_gmulib_stdint_with_bionic.patch new file mode 100644 index 0000000..46705ef --- /dev/null +++ b/android/external/gnupg_fix_gmulib_stdint_with_bionic.patch @@ -0,0 +1,32 @@ +From: Werner Koch +Date: Fri, 27 Jan 2012 17:29:57 +0100 +Subject: [PATCH] gl: Add support for Android to stdint.h replacement. + +* gl/stdint_.h: When included from Bionic , just include +the system's . +--- stdint_.h.orig 2015-10-09 21:44:51.443870121 +0200 ++++ stdint_.h 2015-10-09 21:53:55.933979218 +0200 +@@ -18,6 +18,16 @@ + #ifndef _GL_STDINT_H + #define _GL_STDINT_H + ++/* On Android (Bionic libc), includes this file before ++ having defined 'time_t'. Therefore in this case avoid including ++ other system header files; just include the system's . ++ Ideally we should test __BIONIC__ here, but it is only defined after ++ has been included; hence test __ANDROID__ instead. */ ++#if defined __ANDROID__ \ ++ && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_ ++# include_next ++#else ++ + /* + * ISO C 99 for platforms that lack it. + * +@@ -488,4 +498,6 @@ + + #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */ + ++#endif /* !(defined __ANDROID__ && ...) */ ++ + #endif /* _GL_STDINT_H */