From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 9 Mar 2002 12:02:59 +0000 (+0000)
Subject: Patch #494047: removes 64-bit ?: to cope on plan9.
X-Git-Tag: v2.3c1~6538
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8bb9eba31bb9352b1fdf19da490b3238fe8cb3e;p=python

Patch #494047: removes 64-bit ?: to cope on plan9.
---

diff --git a/Objects/longobject.c b/Objects/longobject.c
index f3e7df7134..c17d56f12c 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -694,7 +694,11 @@ PyLong_AsLongLong(PyObject *vv)
 			(PyLongObject *)vv, (unsigned char *)&bytes,
 			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
 
-	return res < 0 ? (LONG_LONG)res : bytes;
+	/* Plan 9 can't handle LONG_LONG in ? : expressions */
+	if (res < 0)
+		return (LONG_LONG)res;
+	else
+		return bytes;
 }
 
 /* Get a C unsigned LONG_LONG int from a long int object.
@@ -716,7 +720,11 @@ PyLong_AsUnsignedLongLong(PyObject *vv)
 			(PyLongObject *)vv, (unsigned char *)&bytes,
 			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
 
-	return res < 0 ? (unsigned LONG_LONG)res : bytes;
+	/* Plan 9 can't handle LONG_LONG in ? : expressions */
+	if (res < 0)
+		return (unsigned LONG_LONG)res;
+	else
+		return bytes;
 }
 
 #undef IS_LITTLE_ENDIAN