From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 4 Mar 2016 11:19:15 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fc00932fd49fa535551cc4bba09c4e4be059ab4;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

1fc00932fd49fa535551cc4bba09c4e4be059ab4
diff --cc src/python.c
index 9d732772d,110a8e024..c75241434
--- a/src/python.c
+++ b/src/python.c
@@@ -1063,7 -1017,8 +1063,7 @@@ PyMODINIT_FUNC PyInit_collectd(void) 
  }
  #endif
  
- static int cpy_init_python() {
+ static int cpy_init_python(void) {
 -	char *argv = "";
  	PyObject *sys;
  	PyObject *module;