diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/firefox/patches | |
parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) |
fix conflict
Diffstat (limited to 'package/firefox/patches')
-rw-r--r-- | package/firefox/patches/patch-xpcom_ds_nsMathUtils_h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h new file mode 100644 index 000000000..7c5b42fb6 --- /dev/null +++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h @@ -0,0 +1,11 @@ +--- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2011-07-08 03:15:44.000000000 +0200 ++++ mozilla-release/xpcom/ds/nsMathUtils.h 2011-08-01 14:40:58.343424403 +0200 +@@ -170,7 +170,7 @@ inline NS_HIDDEN_(bool) NS_finite(double + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + |