summaryrefslogtreecommitdiff
path: root/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-06 17:38:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-06 17:48:48 +0100
commitc481446c0210205deca32bef6e199b5dd84f7b11 (patch)
tree2375cf3650f2d8312d1aa77172cac997671ea5d0 /package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
parent27a65fefdbebf3f0b3a5e860126de7edc82b2e18 (diff)
update firefox, partially working.
Diffstat (limited to 'package/firefox/patches/patch-xpcom_ds_nsMathUtils_h')
-rw-r--r--package/firefox/patches/patch-xpcom_ds_nsMathUtils_h22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
index b275a14ec..0b3a738bb 100644
--- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
+++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
@@ -1,20 +1,20 @@
---- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/ds/nsMathUtils.h 2013-10-23 16:28:38.000000000 +0200
-@@ -98,12 +98,16 @@ inline NS_HIDDEN_(bool) NS_finite(double
+--- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2015-01-09 05:38:29.000000000 +0100
++++ mozilla-release/xpcom/ds/nsMathUtils.h 2015-01-29 21:37:27.000000000 +0100
+@@ -104,12 +104,16 @@ NS_finite(double aNum)
#ifdef WIN32
- // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
- return !!_finite(d);
+ // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+ return !!_finite(aNum);
-#elif defined(XP_DARWIN)
+#elif defined(XP_DARWIN) || defined(__UCLIBC__)
- // Darwin has deprecated |finite| and recommends |isfinite|. The former is
- // not present in the iOS SDK.
- return std::isfinite(d);
+ // Darwin has deprecated |finite| and recommends |isfinite|. The former is
+ // not present in the iOS SDK.
+ return std::isfinite(aNum);
#else
-- return finite(d);
+- return finite(aNum);
+#ifdef _GLIBCXX_CMATH
-+ return std::isfinite(d);
++ return std::isfinite(d);
+#else
-+ return isfinite(d);
++ return isfinite(d);
+#endif
#endif
}