[pypy-svn] r73700 - pypy/branch/cpython-extension/pypy/translator/c/src

[fijal at codespeak.net]

Author: fijal
Date: Tue Apr 13 03:44:13 2010
New Revision: 73700

Modified:
   pypy/branch/cpython-extension/pypy/translator/c/src/commondefs.h
   pypy/branch/cpython-extension/pypy/translator/c/src/obmalloc.c
Log:
don't define Py_uintptr_t here, unused and conflicts with cpyext


Modified: pypy/branch/cpython-extension/pypy/translator/c/src/commondefs.h
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/c/src/commondefs.h	(original)
+++ pypy/branch/cpython-extension/pypy/translator/c/src/commondefs.h	Tue Apr 13 03:44:13 2010
@@ -69,9 +69,6 @@
 
 /********************************************************/
 
-typedef long Py_intptr_t;
-typedef unsigned long Py_uintptr_t;
-
 #if ((-1) >> 1) > 0
 #  define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \
 	  ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J))

Modified: pypy/branch/cpython-extension/pypy/translator/c/src/obmalloc.c
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/c/src/obmalloc.c	(original)
+++ pypy/branch/cpython-extension/pypy/translator/c/src/obmalloc.c	Tue Apr 13 03:44:13 2010
@@ -225,7 +225,7 @@
 #define ulong			unsigned long	/* assuming >= 32 bits */
 
 #undef uptr
-#define uptr			Py_uintptr_t
+#define uptr			unsigned long
 
 /* When you say memory, my mind reasons in terms of (pointers to) blocks */
 typedef uchar block;