diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-27 03:07:09 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-27 03:07:09 +0800 |
| commit | 073b731b40bba5987ced7588ffa8788883a060e9 (patch) | |
| tree | b24f29f22c4a59be1f3a3a161546287ff81de6fe /www/mozilla/files/patch-Double.cpp | |
| parent | 97fb767ed781bd5ea52c4e6ae7dca3d3dc2023a3 (diff) | |
| download | marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.gz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.bz2 marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.lz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.xz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.zst marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.zip | |
Mark CONFLICTS with xulrunner
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11188 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/mozilla/files/patch-Double.cpp')
| -rw-r--r-- | www/mozilla/files/patch-Double.cpp | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/www/mozilla/files/patch-Double.cpp b/www/mozilla/files/patch-Double.cpp new file mode 100644 index 000000000..05052cf7c --- /dev/null +++ b/www/mozilla/files/patch-Double.cpp @@ -0,0 +1,59 @@ +--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 ++++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 +@@ -51,10 +51,10 @@ + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. + #ifdef __FreeBSD__ + #include <ieeefp.h> +-#ifdef __alpha__ +-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else ++#if defined(__i386__) || defined(__amd64__) + fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#else ++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif +@@ -75,22 +75,31 @@ + #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 + #define TX_DOUBLE_HI32_MANTMASK 0x000fffff + ++union ui32dun { ++ PRUint32 i[2]; ++ double d; ++}; ++ + //-- Initialize Double related constants + #ifdef IS_BIG_ENDIAN +-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, +- 0xffffffff}; +-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; +-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; ++const union ui32dun nanMask = ++ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; ++const union ui32dun infMask = ++ {{TX_DOUBLE_HI32_EXPMASK, 0}}; ++const union ui32dun negInfMask = ++ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; + #else +-const PRUint32 nanMask[2] = {0xffffffff, +- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; +-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; +-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; ++const union ui32dun nanMask = ++ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; ++const union ui32dun infMask = ++ {{0, TX_DOUBLE_HI32_EXPMASK}}; ++const union ui32dun negInfMask = ++ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; + #endif + +-const double Double::NaN = *((double*)nanMask); +-const double Double::POSITIVE_INFINITY = *((double*)infMask); +-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); ++const double Double::NaN = nanMask.d; ++const double Double::POSITIVE_INFINITY = infMask.d; ++const double Double::NEGATIVE_INFINITY = negInfMask.d; + + /* + * Determines whether the given double represents positive or negative |