From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 17 Nov 2012 20:18:52 +0000 (+0000)
Subject: Issue #9742: Sneaky fix for build failure on Solaris 9.
X-Git-Tag: v2.7.5~109^2~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=115bc79df857a1b36db9b9d0df4d1a38cff97901;p=python

Issue #9742: Sneaky fix for build failure on Solaris 9.
---

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 30f7b3489d..ba867ef149 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1088,6 +1088,15 @@ _Py_double_round(double x, int ndigits) {
     PyObject *result = NULL;
     _Py_SET_53BIT_PRECISION_HEADER;
 
+    /* Easy path for the common case ndigits == 0. */
+    if (ndigits == 0) {
+        rounded = round(x);
+        if (fabs(rounded - x) == 0.5)
+            /* halfway between two integers; use round-away-from-zero */
+            rounded = x + (x > 0.0 ? 0.5 : -0.5);
+        return PyFloat_FromDouble(rounded);
+    }
+
     /* The basic idea is very simple: convert and round the double to a
        decimal string using _Py_dg_dtoa, then convert that decimal string
        back to a double with _Py_dg_strtod.  There's one minor difficulty: