diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-02-08 14:57:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-02-08 14:57:27 +0100 |
| commit | 06192043a983061e81b44536b00c89f377a1b129 (patch) | |
| tree | 906032a6f214526d73b4c0edfb6d829789560bbd /package/firefox/patches/patch-xpcom_ds_nsMathUtils_h | |
| parent | 41b1b121a3c856ecd1b5f2e7dcdab10a31981831 (diff) | |
| parent | c481446c0210205deca32bef6e199b5dd84f7b11 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox/patches/patch-xpcom_ds_nsMathUtils_h')
| -rw-r--r-- | package/firefox/patches/patch-xpcom_ds_nsMathUtils_h | 22 |
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 } |