projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.0'
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
c39aff8
..
49454f0
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-31,16
+31,8
@@
#include <sys/socket.h>
#include <sys/socket.h>
-#if OWN_LIBIPTC
-# include "owniptc/libiptc.h"
-# include "owniptc/libip6tc.h"
-
-# define HAVE_IPTC_HANDLE_T 1
-# define HAVE_IP6TC_HANDLE_T 1
-
-#else /* if !OWN_LIBIPTC */
-# include <libiptc/libiptc.h>
-# include <libiptc/libip6tc.h>
+#include <libiptc/libiptc.h>
+#include <libiptc/libip6tc.h>
/*
* iptc_handle_t was available before libiptc was officially available as a
/*
* iptc_handle_t was available before libiptc was officially available as a
@@
-54,13
+46,12
@@
* this is somewhat hacky, I didn't find better way to solve that :-/
* -tokkee
*/
* this is somewhat hacky, I didn't find better way to solve that :-/
* -tokkee
*/
-#
ifndef HAVE_IPTC_HANDLE_T
+#ifndef HAVE_IPTC_HANDLE_T
typedef struct iptc_handle iptc_handle_t;
typedef struct iptc_handle iptc_handle_t;
-#
endif
-#
ifndef HAVE_IP6TC_HANDLE_T
+#endif
+#ifndef HAVE_IP6TC_HANDLE_T
typedef struct ip6tc_handle ip6tc_handle_t;
typedef struct ip6tc_handle ip6tc_handle_t;
-# endif
-#endif /* !OWN_LIBIPTC */
+#endif
/*
* (Module-)Global variables
/*
* (Module-)Global variables