[15393] | 1 | Index: ../trunk-jpl/src/wrappers/python/include/wrapper_macros.h
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/wrappers/python/include/wrapper_macros.h (revision 15106)
|
---|
| 4 | +++ ../trunk-jpl/src/wrappers/python/include/wrapper_macros.h (revision 15107)
|
---|
| 5 | @@ -42,13 +42,13 @@
|
---|
| 6 | #if _PYTHON_MAJOR_ >=3
|
---|
| 7 | /* WRAPPER 3.2 {{{*/
|
---|
| 8 | #define WRAPPER(modulename,...) \
|
---|
| 9 | -
|
---|
| 10 | +\
|
---|
| 11 | static PyObject* modulename(PyObject* self,PyObject* args);\
|
---|
| 12 | static PyMethodDef modulename##_funcs[] = {\
|
---|
| 13 | {#modulename, (PyCFunction)modulename, METH_VARARGS, ""},\
|
---|
| 14 | {NULL,NULL,0,NULL}\
|
---|
| 15 | };\
|
---|
| 16 | -
|
---|
| 17 | +\
|
---|
| 18 | static struct PyModuleDef modulename##module= {\
|
---|
| 19 | PyModuleDef_HEAD_INIT,\
|
---|
| 20 | #modulename, /* name of module */\
|
---|
| 21 | @@ -57,31 +57,31 @@
|
---|
| 22 | or -1 if the module keeps state in global variables. */\
|
---|
| 23 | modulename##_funcs\
|
---|
| 24 | };\
|
---|
| 25 | -
|
---|
| 26 | +\
|
---|
| 27 | PyMODINIT_FUNC PyInit_##modulename(void){\
|
---|
| 28 | -
|
---|
| 29 | +\
|
---|
| 30 | import_array();\
|
---|
| 31 | return PyModule_Create(&modulename##module);\
|
---|
| 32 | }\
|
---|
| 33 | -
|
---|
| 34 | +\
|
---|
| 35 | static PyObject* modulename(PyObject* self,PyObject* args)
|
---|
| 36 | /*}}}*/
|
---|
| 37 | #else
|
---|
| 38 | /* WRAPPER 2.7 {{{*/
|
---|
| 39 | #define WRAPPER(modulename,...) \
|
---|
| 40 | -
|
---|
| 41 | +\
|
---|
| 42 | static PyObject* modulename(PyObject* self,PyObject* args);\
|
---|
| 43 | static PyMethodDef modulename##_funcs[] = {\
|
---|
| 44 | {#modulename, (PyCFunction)modulename, METH_VARARGS, ""},\
|
---|
| 45 | {NULL,NULL,0,NULL}\
|
---|
| 46 | };\
|
---|
| 47 | -
|
---|
| 48 | +\
|
---|
| 49 | PyMODINIT_FUNC init##modulename(void){\
|
---|
| 50 | -
|
---|
| 51 | +\
|
---|
| 52 | import_array();\
|
---|
| 53 | (void) Py_InitModule(#modulename, modulename##_funcs);\
|
---|
| 54 | }\
|
---|
| 55 | -
|
---|
| 56 | +\
|
---|
| 57 | static PyObject* modulename(PyObject* self,PyObject* args)
|
---|
| 58 | /*}}}*/
|
---|
| 59 | #endif
|
---|