diff options
| author | Jeff Armstrong <jeffrey.armstrong@approximatrix.com> | 2011-07-18 22:19:18 -0400 |
|---|---|---|
| committer | Jeff Armstrong <jeffrey.armstrong@approximatrix.com> | 2011-07-18 22:19:18 -0400 |
| commit | cc7842ec950d89dcf35638a954271d2a6fad332b (patch) | |
| tree | 74cb33e10ca17b3c2bec2e7325e9c68f052d97ef /lib/ldg_Python.h | |
| parent | 23b87723883c224c03dedd303a61a10d054292d9 (diff) | |
| download | gempy-cc7842ec950d89dcf35638a954271d2a6fad332b.tar.gz gempy-cc7842ec950d89dcf35638a954271d2a6fad332b.zip | |
GEM library is now compiling to SLB.
Diffstat (limited to 'lib/ldg_Python.h')
| -rw-r--r-- | lib/ldg_Python.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/ldg_Python.h b/lib/ldg_Python.h index ca16e51..e4538b4 100644 --- a/lib/ldg_Python.h +++ b/lib/ldg_Python.h @@ -4,23 +4,28 @@ #include <Python.h> #include <ldg.h> -#define PY_API_FCOUNT 11 +#define PY_API_FCOUNT 12 #ifndef LDG_INTERNAL extern void *pycallbacks[PY_API_FCOUNT]; +extern PyObject *GEMError; +#else +void *pycallbacks[PY_API_FCOUNT]; +PyObject *GEMError; #endif #define Py_InitModule(name,methods) ldg_callback(pycallbacks[0],name,methods,NULL,NULL) #define PyArg_ParseTuple(tpl,...) ldg_callback(pycallbacks[1],tpl,##__VA_ARGS__) -#define Py_BuildValue(fmt,...) ldg_callback(pycallbacks[2],fmt,##__VA_ARGS__) +#define Py_BuildValue(fmt,...) ((PyObject *)ldg_callback(pycallbacks[2],fmt,##__VA_ARGS__)) #define PyErr_NewException(obj,pt1,pt2) ldg_callback(pycallbacks[3],obj,pt1,pt2) #define PyErr_SetString(obj,s) ldg_callback(pycallbacks[4],obj,s) #define PyModule_AddObject(m,s,o) ldg_callback(pycallbacks[5],m,s,o) -#define PyCapsule_New(pt,s,de) ldg_callback(pycallbacks[6],pt,s,de) -#define PyCapsule_GetPointer(c,s) ldg_callback(pycallbacks[7],c,s) +#define PyCapsule_New(pt,s,de) ((PyObject *)ldg_callback(pycallbacks[6],pt,s,de)) +#define PyCapsule_GetPointer(c,s) ((void *)ldg_callback(pycallbacks[7],c,s)) #define Py_IncRef(obj) ldg_callback(pycallbacks[8],obj) #define Py_DecRef(obj) ldg_callback(pycallbacks[9],obj) -#define Py_None pycallbacks[10] +#define Py_None ((PyObject *)pycallbacks[10]) +#define PyArg_ParseTupleAndKeywords(tpl,...) ldg_callback(pycallbacks[11],tpl,##__VA_ARGS__) #define Py_INCREF(obj) ldg_callback(pycallbacks[8],obj) #define Py_DECREF(obj) ldg_callback(pycallbacks[9],obj) |