[pypy-svn] r73432 - in pypy/branch/cpython-extension/pypy/module/cpyext: include src

[xoraxax at codespeak.net]

Author: xoraxax
Date: Tue Apr  6 01:42:04 2010
New Revision: 73432

Modified:
   pypy/branch/cpython-extension/pypy/module/cpyext/include/Python.h
   pypy/branch/cpython-extension/pypy/module/cpyext/src/getargs.c
Log:
Enable new type monikers, define a few sizes.

Modified: pypy/branch/cpython-extension/pypy/module/cpyext/include/Python.h
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/include/Python.h	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/include/Python.h	Tue Apr  6 01:42:04 2010
@@ -34,6 +34,8 @@
 #define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
 #define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
 #define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE)
+#define SIZEOF_SIZE_T 4
+#define SIZEOF_LONG 4
 
 /* Convert a possibly signed character to a nonnegative int */
 /* XXX This assumes characters are 8 bits wide */

Modified: pypy/branch/cpython-extension/pypy/module/cpyext/src/getargs.c
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/src/getargs.c	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/src/getargs.c	Tue Apr  6 01:42:04 2010
@@ -667,7 +667,7 @@
 			*p = ival;
 		break;
 	}
-	
+#endif	
 	case 'n': /* Py_ssize_t */
 #if SIZEOF_SIZE_T != SIZEOF_LONG
 	{
@@ -696,6 +696,7 @@
 		break;
 	}
 
+#if 0
 	case 'k': { /* long sized bitfield */
 		unsigned long *p = va_arg(*p_va, unsigned long *);
 		unsigned long ival;