Merge commit '3fe45ff'

Author: highperformancecoder

pythonCAPI.cc

@@ -59,6 +59,11 @@ extern "C"
   APIFN(PyObject*, PyErr_Occurred, (), ());
   VOID_APIFN(PyErr_Print,(),());
   VOID_APIFN(PyErr_SetString,(PyObject* o,const char* s),(o,s));
+  APIFN(PyObject*, PyType_GenericAlloc,(PyTypeObject* t, Py_ssize_t n),(t,n));
+  APIFN(PyObject*, PyType_GenericNew,(PyTypeObject* t, PyObject* a, PyObject* k),(t,a,k));
+
+  APIFN(int,Py_IsInitialized,(),());
+  APIFN(PyObject*,PySys_GetObject,(const char *name),(name));
 
   APIFN(PyObject*, Py_GetConstantBorrowed,(unsigned x),(x));
   APIFN(int, PyType_IsSubtype,(PyTypeObject* o1, PyTypeObject* o2),(o1,o2));
@@ -74,7 +79,8 @@ extern "C"
   APIFN(PyObject*, PyObject_GetAttr, (PyObject* o, PyObject* a), (o,a));
   APIFN(PyObject*, PyObject_GenericGetAttr, (PyObject* o, PyObject* a), (o,a));
   APIFN(int, PyObject_SetAttrString, (PyObject* o, const char* a, PyObject* v), (o,a,v));
-  
+  APIFN(PyObject*, PyObject_Call, (PyObject* c, PyObject* a, PyObject* k),(c,a,k));
+
   APIFN(int, PyModule_AddObject, (PyObject* o, const char* n, PyObject* v), (o,n,v));
   APIFN(const char*, PyModule_GetName, (PyObject* o), (o));
   APIFN(PyObject*, PyModule_Create2, (PyModuleDef* m,int i), (m,i));
@@ -85,6 +91,8 @@ extern "C"
   APIFN(PyObject*, PyUnicode_FromString, (const char* s), (s));
   APIFN(char*, PyUnicode_AsUTF8AndSize, (PyObject* s,Py_ssize_t* sz), (s,sz));
 
+  APIFN(PyObject*, PyTuple_New, (Py_ssize_t s), (s));
+  
   APIFN(PyObject*, PyDict_New, (), ());
   APIFN(int, PyDict_SetItemString, (PyObject* d, const char* k, PyObject* v), (d,k,v));
 

pythonCAPI.h

@@ -125,8 +125,8 @@ typedef PyObject *(*iternextfunc) (PyObject *);
 typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
 typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
 typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *);
-typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t);
+typedef PyObject *(*newfunc)(PyTypeObject*, PyObject *, PyObject *);
+typedef PyObject *(*allocfunc)(PyTypeObject*, Py_ssize_t);
 typedef int (*visitproc)(PyObject *, void *);
 typedef int (*traverseproc)(PyObject *, visitproc, void *);
 typedef int (*inquiry)(PyObject *);
@@ -265,7 +265,11 @@ extern "C" {
   PyObject* PyErr_Occurred();
   void PyErr_Print();
   void PyErr_SetString(PyObject*,const char*);
-
+  PyObject* PyType_GenericAlloc(PyTypeObject*, Py_ssize_t);
+  PyObject* PyType_GenericNew(PyTypeObject*, PyObject*, PyObject*);
+  
+  int Py_IsInitialized();
+  PyObject* PySys_GetObject(const char *name);
 
   extern PyTypeObject* PyBool_Type;
   extern PyTypeObject* PyFloat_Type;
@@ -285,7 +289,8 @@ extern "C" {
   PyObject* PyObject_GetAttr(PyObject*, PyObject*);
   PyObject* PyObject_GenericGetAttr(PyObject*, PyObject*);
   int PyObject_SetAttrString(PyObject*, const char*, PyObject*);
-  
+  PyObject* PyObject_Call(PyObject*, PyObject*, PyObject*);
+    
   int PyModule_AddObject(PyObject*, const char*, PyObject*);
   const char* PyModule_GetName(PyObject*);
   PyObject* PyModule_Create2(PyModuleDef*,int);
@@ -296,6 +301,8 @@ extern "C" {
   PyObject* PyUnicode_FromString(const char*);
   char* PyUnicode_AsUTF8AndSize(PyObject*,Py_ssize_t*);
 
+  PyObject* PyTuple_New(Py_ssize_t);
+  
   PyObject* PyDict_New();
   int PyDict_SetItemString(PyObject* dp, const char* key, PyObject* item);