Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13307/include
Modified Files:
MPython.h
Log Message:
hook up additional functions and variables used by recent swig-generated code
Index: MPython.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MPython.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- MPython.h 21 Jul 2004 23:30:36 -0000 1.14
+++ MPython.h 9 Apr 2005 19:56:57 -0000 1.15
@@ -74,4 +74,5 @@
//extern void (*M_PyErr_SetNone)(PyObject *);
extern void (*M_PyErr_SetString)(PyObject *, const char *);
+ extern PyObject *(*M_PyErr_Format)(PyObject *, const char *, ...);
// objects
@@ -87,11 +88,14 @@
extern int (*M_PyObject_Size)(PyObject *);
- // ints
+ // ints and longs
extern long(*M_PyInt_AsLong)(PyObject *);
extern PyObject*(*M_PyInt_FromLong)(long);
+ extern PyObject *(*M_PyLong_FromUnsignedLong)(unsigned long);
+ extern long (*M_PyLong_AsLong)(PyObject *);
+ extern unsigned long (*M_PyLong_AsUnsignedLong)(PyObject *);
extern PyTypeObject *M_PyInt_Type;
-
- // longs
extern PyTypeObject *M_PyLong_Type;
+ extern PyIntObject *M__Py_TrueStruct;
+ extern PyIntObject *M__Py_ZeroStruct;
// strings
@@ -161,4 +165,5 @@
#define PyErr_Restore M_PyErr_Restore
#define PyErr_SetString M_PyErr_SetString
+#define PyErr_Format M_PyErr_Format
// objects
@@ -177,11 +182,14 @@
#define PyObject_Size M_PyObject_Size
-// ints
+// ints and longs
#define PyInt_AsLong M_PyInt_AsLong
#define PyInt_FromLong M_PyInt_FromLong
+#define PyLong_FromUnsignedLong M_PyLong_FromUnsignedLong
+#define PyLong_AsLong M_PyLong_AsLong
+#define PyLong_AsUnsignedLong M_PyLong_AsUnsignedLong
#define PyInt_Type (*M_PyInt_Type)
-
-// longs
#define PyLong_Type (*M_PyLong_Type)
+#define _Py_TrueStruct (*M__Py_TrueStruct)
+#define _Py_ZeroStruct (*M__Py_ZeroStruct)
// strings
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
