From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 15 May 2007 17:27:31 +0000 (+0200)
Subject: Merge branch 'master' into collectd-4
X-Git-Tag: collectd-4.0.0~42^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=44e4d530c8db2e078cd73ab254d1be41a5f2812c

Merge branch 'master' into collectd-4

Conflicts:

	src/multimeter.c
	src/network.c
	src/utils_debug.c
---

44e4d530c8db2e078cd73ab254d1be41a5f2812c
diff --cc src/common.c
index 6521a58b,fd1fbd40..bcdf59aa
--- a/src/common.c
+++ b/src/common.c
@@@ -20,8 -22,12 +20,12 @@@
   *   Niki W. Waibel <niki.waibel@gmx.net>
  **/
  
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+ 
  #include "common.h"
 -#include "utils_debug.h"
 +#include "plugin.h"
  
  #ifdef HAVE_MATH_H
  #  include <math.h>
diff --cc src/utils_ignorelist.c
index f71ac1d7,d002c7aa..d2546aab
--- a/src/utils_ignorelist.c
+++ b/src/utils_ignorelist.c
@@@ -47,8 -47,12 +47,12 @@@
   *     return;
   **/
  
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+ 
  #include "common.h"
 -#include "utils_debug.h"
 +#include "plugin.h"
  #include "utils_ignorelist.h"
  
  /*