diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-13 12:44:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-13 12:44:37 +0000 |
| commit | 675ac7f71d9221b6c5db430e4725cbbbab725cd1 (patch) | |
| tree | 84df5b9a450644bdb967cf3fbcabf8b7a431db1e /main/firefox/0002-Use-C99-math-isfinite.patch | |
| parent | c33dad369ded7a4d197417f49e54730ad84a6761 (diff) | |
| download | aports-675ac7f71d9221b6c5db430e4725cbbbab725cd1.tar.bz2 aports-675ac7f71d9221b6c5db430e4725cbbbab725cd1.tar.xz | |
main/firefox: upgrade to 38.0 (esr)
Diffstat (limited to 'main/firefox/0002-Use-C99-math-isfinite.patch')
| -rw-r--r-- | main/firefox/0002-Use-C99-math-isfinite.patch | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/main/firefox/0002-Use-C99-math-isfinite.patch b/main/firefox/0002-Use-C99-math-isfinite.patch index 03f830bcae..ba4f5cfb3d 100644 --- a/main/firefox/0002-Use-C99-math-isfinite.patch +++ b/main/firefox/0002-Use-C99-math-isfinite.patch @@ -1,29 +1,17 @@ -From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Nov 2011 08:30:51 +0000 -Subject: [PATCH 2/4] Use C99 math isfinite - ---- - xpcom/ds/nsMathUtils.h | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h -index 21ffbec..2e80476 100644 ---- a/xpcom/ds/nsMathUtils.h -+++ b/xpcom/ds/nsMathUtils.h -@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d) - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(d); +--- ./xpcom/ds/nsMathUtils.h.orig ++++ ./xpcom/ds/nsMathUtils.h +@@ -104,12 +104,12 @@ + #ifdef WIN32 + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(aNum); +-#elif defined(XP_DARWIN) ++#elif defined(XP_DARWIN) || defined(_GLIBCXX_CMATH) + // Darwin has deprecated |finite| and recommends |isfinite|. The former is + // not present in the iOS SDK. + return std::isfinite(aNum); #else -- return finite(d); -+#ifdef _GLIBCXX_CMATH -+ return std::isfinite(d); -+#else -+ return isfinite(d); -+#endif +- return finite(aNum); ++ return isfinite(aNum); #endif } --- -1.7.7.4 - |