From: Hye-Shik Chang <hyeshik@gmail.com>
Date: Sat, 21 Jun 2008 11:15:30 +0000 (+0000)
Subject: Fix build on FreeBSD gcc.
X-Git-Tag: v2.6b2~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30fa13f3a00e9d782f7ae1bef380d663ab9956c2;p=python

Fix build on FreeBSD gcc.
---

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index bbe8a19616..f8d1207b83 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -405,11 +405,11 @@ PyFloat_AsStringEx(char *buf, PyFloatObject *v, int precision)
    obj is not of float, int or long type, Py_NotImplemented is incref'ed,
    stored in obj, and returned from the function invoking this macro.
 */
-#define CONVERT_TO_DOUBLE(obj, dbl)			\
-	if (PyFloat_Check(obj))				\
-		dbl = PyFloat_AS_DOUBLE(obj);		\
-	else if (convert_to_double(&(obj), &(dbl)) < 0)	\
-		return obj;
+#define CONVERT_TO_DOUBLE(obj, dbl)					\
+	if (PyFloat_Check(obj))						\
+		dbl = PyFloat_AS_DOUBLE(obj);				\
+	else if (convert_to_double((PyObject **)&(obj), &(dbl)) < 0)	\
+		return (PyObject *)(obj);
 
 static int
 convert_to_double(PyObject **v, double *dbl)
@@ -1212,7 +1212,7 @@ _float_to_base(PyFloatObject *v, unaryfunc int_to_base)
 	int i, exp, n;
 	char *conv_str;
 
-	CONVERT_TO_DOUBLE(((PyObject *)v), x);
+	CONVERT_TO_DOUBLE(v, x);
 	if (!Py_IS_FINITE(x))
 		return PyObject_Repr((PyObject *)v);
 	fr = frexp(x, &exp);