diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-09-06 20:47:26 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-09-06 20:47:26 (GMT) |
commit | ca4706399879b30e952c402637b4fc0d4d2e661c (patch) | |
tree | 72f97b545d4d31afd06a8874fcbb578cb178aa0d /Objects | |
parent | 3c397e4c39430000348f2f64d9e394bf1b61c509 (diff) | |
download | cpython-ca4706399879b30e952c402637b4fc0d4d2e661c.zip cpython-ca4706399879b30e952c402637b4fc0d4d2e661c.tar.gz cpython-ca4706399879b30e952c402637b4fc0d4d2e661c.tar.bz2 |
replace Py_(u)intptr_t with the c99 standard types
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/descrobject.c | 2 | ||||
-rw-r--r-- | Objects/longobject.c | 4 | ||||
-rw-r--r-- | Objects/obmalloc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 8b53ac2..076e741 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1019,7 +1019,7 @@ wrapper_dealloc(wrapperobject *wp) static PyObject * wrapper_richcompare(PyObject *a, PyObject *b, int op) { - Py_intptr_t result; + intptr_t result; PyObject *v; PyWrapperDescrObject *a_descr, *b_descr; diff --git a/Objects/longobject.c b/Objects/longobject.c index e0be8b3..6eb40e4 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -989,13 +989,13 @@ PyObject * PyLong_FromVoidPtr(void *p) { #if SIZEOF_VOID_P <= SIZEOF_LONG - return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); + return PyLong_FromUnsignedLong((unsigned long)(uintptr_t)p); #else #if SIZEOF_LONG_LONG < SIZEOF_VOID_P # error "PyLong_FromVoidPtr: sizeof(long long) < sizeof(void*)" #endif - return PyLong_FromUnsignedLongLong((unsigned long long)(Py_uintptr_t)p); + return PyLong_FromUnsignedLongLong((unsigned long long)(uintptr_t)p); #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ } diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 3f95133..c201da1 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -18,7 +18,7 @@ extern void _PyMem_DumpTraceback(int fd, const void *ptr); #define uint unsigned int /* assuming >= 16 bits */ #undef uptr -#define uptr Py_uintptr_t +#define uptr uintptr_t /* Forward declaration */ static void* _PyMem_DebugRawMalloc(void *ctx, size_t size); |