#200144

r=sicking, a=mkaply
Remove XP_OS2 #ifdefs from transformiix

extensions/transformiix/source/xpath/MultiplicativeExpr.cpp

@@ -68,7 +68,7 @@ MultiplicativeExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
     switch ( op ) {
         case DIVIDE:
             if (rightDbl == 0) {
-#if defined(XP_WIN) || defined(XP_OS2)
+#if defined(XP_WIN)
                 /* XXX MSVC miscompiles such that (NaN == 0) */
                 if (Double::isNaN(rightDbl))
                     result = Double::NaN;
@@ -89,7 +89,7 @@ MultiplicativeExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
                 result = Double::NaN;
             }
             else {
-#if defined(XP_WIN) || defined(XP_OS2)
+#if defined(XP_WIN)
                 /* Workaround MS fmod bug where 42 % (1/0) => NaN, not 42. */
                 if (!Double::isInfinite(leftDbl) && Double::isInfinite(rightDbl))
                     result = leftDbl;

extensions/transformiix/source/xpath/RelationalExpr.cpp

@@ -108,7 +108,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
                  rtype == txAExprResult::NUMBER) {
             double lval = aLeft->numberValue();
             double rval = aRight->numberValue();
-#if defined(XP_WIN) || defined(XP_OS2)
+#if defined(XP_WIN)
             if (Double::isNaN(lval) || Double::isNaN(rval))
                 result = PR_FALSE;
             else
@@ -147,7 +147,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
 
     double leftDbl = aLeft->numberValue();
     double rightDbl = aRight->numberValue();
-#if defined(XP_WIN) || defined(XP_OS2)
+#if defined(XP_WIN)
     if (Double::isNaN(leftDbl) || Double::isNaN(rightDbl))
         return PR_FALSE;
 #endif