From: Florian Forster Date: Wed, 30 Apr 2008 08:26:28 +0000 (+0200) Subject: Merge branch 'collectd-4.2' into collectd-4.3 X-Git-Tag: collectd-4.4.0~4^2~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d5a7847b03d78a94b6a0b153abeb630b4b94ddd;p=collectd.git Merge branch 'collectd-4.2' into collectd-4.3 --- 9d5a7847b03d78a94b6a0b153abeb630b4b94ddd diff --cc src/collectd.c index 984ff757,ab9c89d2..4e521f9f --- a/src/collectd.c +++ b/src/collectd.c @@@ -23,13 -23,14 +23,17 @@@ #include "collectd.h" #include "common.h" +#include +#include +#include + #include "plugin.h" #include "configfile.h" -#include "types_list.h" + #if HAVE_STATGRAB_H + # include + #endif + /* * Global variables */