author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 8 Dec 2009 11:26:28 +0000 (12:26 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 8 Dec 2009 11:26:28 +0000 (12:26 +0100) |
src/pyconfig.c | patch | blob | history | |
src/python.c | patch | blob | history |
diff --git a/src/pyconfig.c b/src/pyconfig.c
index 63b44f8851aea70ea0a49a99ddf36d7ab519d954..ba59b2407df71da04675e7799f1b5dc7b02802a7 100644 (file)
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
#include "cpython.h"
-static const char Config_doc[] = "This represents a piece of collectd's config file.\n"
+static char config_doc[] = "This represents a piece of collectd's config file.\n"
"It is passed to scripts with config callbacks (see \"register_config\")\n"
"and is of little use if created somewhere else.\n"
"\n"
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /*tp_flags*/
- Config_doc, /* tp_doc */
+ config_doc, /* tp_doc */
Config_traverse, /* tp_traverse */
Config_clear, /* tp_clear */
0, /* tp_richcompare */
diff --git a/src/python.c b/src/python.c
index 8491649b5090807440c79d7b5a36ff41f3e37cd8..006aecf6c00083f932a5cd82c7e35328d0e98332 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -531,19 +531,23 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
}
static PyObject *cpy_register_log(PyObject *self, PyObject *args, PyObject *kwds) {
- return cpy_register_generic_userdata(plugin_register_log, cpy_log_callback, args, kwds);
+ return cpy_register_generic_userdata((void *) plugin_register_log,
+ (void *) cpy_log_callback, args, kwds);
}
static PyObject *cpy_register_write(PyObject *self, PyObject *args, PyObject *kwds) {
- return cpy_register_generic_userdata(plugin_register_write, cpy_write_callback, args, kwds);
+ return cpy_register_generic_userdata((void *) plugin_register_write,
+ (void *) cpy_write_callback, args, kwds);
}
static PyObject *cpy_register_notification(PyObject *self, PyObject *args, PyObject *kwds) {
- return cpy_register_generic_userdata(plugin_register_notification, cpy_notification_callback, args, kwds);
+ return cpy_register_generic_userdata((void *) plugin_register_notification,
+ (void *) cpy_notification_callback, args, kwds);
}
static PyObject *cpy_register_flush(PyObject *self, PyObject *args, PyObject *kwds) {
- return cpy_register_generic_userdata(plugin_register_flush, cpy_flush_callback, args, kwds);
+ return cpy_register_generic_userdata((void *) plugin_register_flush,
+ (void *) cpy_flush_callback, args, kwds);
}
static PyObject *cpy_register_shutdown(PyObject *self, PyObject *args, PyObject *kwds) {