Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16277: merge fix from 3.2

This commit is contained in:
Mark Dickinson 2012-10-18 19:53:28 +01:00
parent 206f962f32 91044799f7
commit 44362a88ad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/longobject.c
View File

@ -935,6 +935,13 @@ _PyLong_AsByteArray(PyLongObject* v,
PyObject *
PyLong_FromVoidPtr(void *p)
{
#if SIZEOF_VOID_P <= SIZEOF_LONG
/* special-case null pointer */
if (!p)
return PyLong_FromLong(0);
return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p);
#else
#ifndef HAVE_LONG_LONG
# error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long"
#endif
@ -945,6 +952,7 @@ PyLong_FromVoidPtr(void *p)
if (!p)
return PyLong_FromLong(0);
return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p);
#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
}