From 89fa5381cbd8e13fe859f458ac0f46e13f7ea1c1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Sep 2009 21:14:58 +0000 Subject: [PATCH] PR gdb/10583: * python/py-value.c (valpy_int): Use PyLong_FromLongLong. (valpy_long): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/python/py-value.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 51cee9a078d..4b443ab3aae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-09-22 Tom Tromey + + PR gdb/10583: + * python/py-value.c (valpy_int): Use PyLong_FromLongLong. + (valpy_long): Likewise. + 2009-09-22 Tom Tromey PR python/10680: diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 714aa118005..58bcee3217f 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -784,6 +784,13 @@ valpy_int (PyObject *self) } GDB_PY_HANDLE_EXCEPTION (except); +#ifdef HAVE_LONG_LONG /* Defined by Python. */ + /* If we have 'long long', and the value overflows a 'long', use a + Python Long; otherwise use a Python Int. */ + if (sizeof (l) > sizeof (long) && (l > PyInt_GetMax () + || l < (- (LONGEST) PyInt_GetMax ()) - 1)) + return PyLong_FromLongLong (l); +#endif return PyInt_FromLong (l); } @@ -808,7 +815,11 @@ valpy_long (PyObject *self) } GDB_PY_HANDLE_EXCEPTION (except); +#ifdef HAVE_LONG_LONG /* Defined by Python. */ + return PyLong_FromLongLong (l); +#else return PyLong_FromLong (l); +#endif } /* Implements conversion to float. */ -- 2.30.2