X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcpython.h;h=4f2e83260d0a5b2185e31f89be36e6c2ea52c8cf;hb=e1d4681088e33d3ec256c296dff4dbaeb70b883a;hp=81e580d485c9bd58c625df40b369edd75dd94e75;hpb=218c57128f2e54960133cff3e774b5ef9944068a;p=collectd.git diff --git a/src/cpython.h b/src/cpython.h index 81e580d4..4f2e8326 100644 --- a/src/cpython.h +++ b/src/cpython.h @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. * * Authors: - * Sven Trenkel + * Sven Trenkel **/ /* Some python versions don't include this by default. */ @@ -111,10 +111,10 @@ } while (0) static inline void CPY_STRCAT(PyObject **a, PyObject *b) { PyObject *ret; - + if (!a || !*a) return; - + ret = PyUnicode_Concat(*a, b); Py_DECREF(*a); *a = ret; @@ -156,7 +156,7 @@ static inline PyObject *cpy_string_to_unicode_or_bytes(const char *buf) { return PyBytes_FromString(buf); #else return PyString_FromString(buf); -#endif +#endif } void cpy_log_exception(const char *context); @@ -170,7 +170,7 @@ typedef struct { PyObject *values; /* Sequence */ PyObject *children; /* Sequence */ } Config; -PyTypeObject ConfigType; +extern PyTypeObject ConfigType; typedef struct { PyObject_HEAD /* No semicolon! */ @@ -181,7 +181,7 @@ typedef struct { char type[DATA_MAX_NAME_LEN]; char type_instance[DATA_MAX_NAME_LEN]; } PluginData; -PyTypeObject PluginDataType; +extern PyTypeObject PluginDataType; #define PluginData_New() PyObject_CallFunctionObjArgs((PyObject *) &PluginDataType, (void *) 0) typedef struct { @@ -190,7 +190,7 @@ typedef struct { PyObject *meta; /* dict */ double interval; } Values; -PyTypeObject ValuesType; +extern PyTypeObject ValuesType; #define Values_New() PyObject_CallFunctionObjArgs((PyObject *) &ValuesType, (void *) 0) typedef struct { @@ -198,12 +198,12 @@ typedef struct { int severity; char message[NOTIF_MAX_MSG_LEN]; } Notification; -PyTypeObject NotificationType; +extern PyTypeObject NotificationType; #define Notification_New() PyObject_CallFunctionObjArgs((PyObject *) &NotificationType, (void *) 0) typedef PyLongObject Signed; -PyTypeObject SignedType; +extern PyTypeObject SignedType; typedef PyLongObject Unsigned; -PyTypeObject UnsignedType; +extern PyTypeObject UnsignedType;