summaryrefslogtreecommitdiff
path: root/libxml2
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-22 22:00:37 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-22 22:51:55 +0200
commit6a17d2f2ba7acfec277314b97b50e41532d6b44d (patch)
treea70f87487970cf8761a71dca5d1180b07000f2e4 /libxml2
parent27a9a0d167abfe77ed955df0daf5a0b285d49110 (diff)
No nan() in Clang for Android, it seems
Change-Id: I73fb37de0e4eeefdb08a6da48947afa1fdf02a38
Diffstat (limited to 'libxml2')
-rw-r--r--libxml2/libxml2-android.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/libxml2/libxml2-android.patch b/libxml2/libxml2-android.patch
index cbc9ff477344..06d5e57ad31d 100644
--- a/libxml2/libxml2-android.patch
+++ b/libxml2/libxml2-android.patch
@@ -13,3 +13,15 @@
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
+--- misc/libxml2-2.7.6/trionan.c
++++ misc/build/libxml2-2.7.6/trionan.c
+@@ -327,7 +327,7 @@
+
+ if (result == 0.0) {
+
+-#if defined(TRIO_COMPILER_SUPPORTS_C99)
++#if defined(TRIO_COMPILER_SUPPORTS_C99) && !(defined(__ANDROID__) && defined(__clang__))
+ result = nan("");
+
+ #elif defined(NAN) && defined(__STDC_IEC_559__)
+