Moved rename2's macros relevant to this module here and added comment

about the file's obsolescence.

diff --git a/Include/cgensupport.h b/Include/cgensupport.h
index 40b6a47225064789ba55f979c11cdeec5ee20e45..faf670e7d780ca0b1878b7a3d5e6f8a801c0cb81 100644 (file)
--- a/Include/cgensupport.h
+++ b/Include/cgensupport.h
@@ -37,6 +37,8 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /* Definitions used by cgen output */
 
+/* XXX This file is obsolete.  It is *only* used by glmodule.c. */
+
 typedef char *string;
 
 #define mknewlongobject(x) PyInt_FromLong(x)
@@ -44,6 +46,19 @@ typedef char *string;
 #define mknewfloatobject(x) PyFloat_FromDouble(x)
 #define mknewcharobject(ch) Py_BuildValue("c", ch)
 
+#define getichararg PyArg_GetChar
+#define getidoublearray PyArg_GetDoubleArray
+#define getifloatarg PyArg_GetFloat
+#define getifloatarray PyArg_GetFloatArray
+#define getilongarg PyArg_GetLong
+#define getilongarray PyArg_GetLongArray
+#define getilongarraysize PyArg_GetLongArraySize
+#define getiobjectarg PyArg_GetObject
+#define getishortarg PyArg_GetShort
+#define getishortarray PyArg_GetShortArray
+#define getishortarraysize PyArg_GetShortArraySize
+#define getistringarg PyArg_GetString
+
 extern int PyArg_GetObject Py_PROTO((PyObject *args, int nargs,
                                     int i, PyObject **p_a));
 extern int PyArg_GetLong Py_PROTO((PyObject *args, int nargs,

diff --git a/Modules/cgensupport.h b/Modules/cgensupport.h
index 40b6a47225064789ba55f979c11cdeec5ee20e45..faf670e7d780ca0b1878b7a3d5e6f8a801c0cb81 100644 (file)
--- a/Modules/cgensupport.h
+++ b/Modules/cgensupport.h
@@ -37,6 +37,8 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /* Definitions used by cgen output */
 
+/* XXX This file is obsolete.  It is *only* used by glmodule.c. */
+
 typedef char *string;
 
 #define mknewlongobject(x) PyInt_FromLong(x)
@@ -44,6 +46,19 @@ typedef char *string;
 #define mknewfloatobject(x) PyFloat_FromDouble(x)
 #define mknewcharobject(ch) Py_BuildValue("c", ch)
 
+#define getichararg PyArg_GetChar
+#define getidoublearray PyArg_GetDoubleArray
+#define getifloatarg PyArg_GetFloat
+#define getifloatarray PyArg_GetFloatArray
+#define getilongarg PyArg_GetLong
+#define getilongarray PyArg_GetLongArray
+#define getilongarraysize PyArg_GetLongArraySize
+#define getiobjectarg PyArg_GetObject
+#define getishortarg PyArg_GetShort
+#define getishortarray PyArg_GetShortArray
+#define getishortarraysize PyArg_GetShortArraySize
+#define getistringarg PyArg_GetString
+
 extern int PyArg_GetObject Py_PROTO((PyObject *args, int nargs,
                                     int i, PyObject **p_a));
 extern int PyArg_GetLong Py_PROTO((PyObject *args, int nargs,