[pypy-commit] pypy default: Fix for 392dd419f5d0

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r84344:4a98b6f0536f
Date: 2016-05-10 09:33 +0200
http://bitbucket.org/pypy/pypy/changeset/4a98b6f0536f/

Log:	Fix for 392dd419f5d0

diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -1521,7 +1521,7 @@
 # Instantiated in cpyext/ndarrayobject. It is here since ufunc calls
 # set_dims_and_steps, otherwise ufunc, ndarrayobject would have circular
 # imports
-npy_intpp = rffi.INTPTR_T
+npy_intpp = rffi.INTPTR_TP    # "intptr_t *"
 LONG_SIZE = LONG_BIT / 8
 CCHARP_SIZE = _get_bitsize('P') / 8
 
diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -475,7 +475,7 @@
 TYPES += ['signed char', 'unsigned char',
           'long long', 'unsigned long long',
           'size_t', 'time_t', 'wchar_t',
-          'uintptr_t', 'intptr_t',
+          'uintptr_t', 'intptr_t',    # C note: these two are _integer_ types
           'void*']    # generic pointer type
 
 # This is a bit of a hack since we can't use rffi_platform here.