From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 10 May 2016 16:01:49 +0000 (+0200)
Subject: iptables: include libiptc headers before capability.h
X-Git-Tag: collectd-5.6.0~57^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43954e07f30d05b2da8319749400c9bf4d01c23c;p=collectd.git

iptables: include libiptc headers before capability.h

Some versions of sys/capability.h seem to have conflicting declarations
with other (linux) kernel header files, so order matters.
---

diff --git a/src/iptables.c b/src/iptables.c
index a2ed4c73..66dbab7f 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -30,13 +30,13 @@
 #include "plugin.h"
 #include "configfile.h"
 
+#include <libiptc/libiptc.h>
+#include <libiptc/libip6tc.h>
+
 #ifdef HAVE_SYS_CAPABILITY_H
 # include <sys/capability.h>
 #endif
 
-#include <libiptc/libiptc.h>
-#include <libiptc/libip6tc.h>
-
 /*
  * iptc_handle_t was available before libiptc was officially available as a
  * shared library. Note, that when the shared lib was introduced, the API and