Move defines in compat_xtables.h down to avoid redeclaration errors

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 709fbc6fc2458c9ae32f05afd041758e84967d6c..04b4071bff8a9578ac5ea31a1cae12f74f5ac4a0 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -5,10 +5,10 @@ srcdir          := @srcdir@
 abstop_srcdir   := $(shell readlink -e ${top_srcdir})
 abssrcdir       := $(shell readlink -e ${srcdir})
 
-if (${abstop_srcdir},)
+ifeq (${abstop_srcdir},)
 $(error Path resolution of ${top_srcdir} failed)
 endif
-if (${abssrcdir},)
+ifeq (${abssrcdir},)
 $(error Path resolution of ${srcdir} failed)
 endif
 

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 184e495b078c5f03b003c6f966ae68000484bc4c..e5b1e4c95357d0093f108df33f29b837f50e160d 100644 (file)
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -2,6 +2,7 @@
 #define _XTABLES_COMPAT_H 1
 
 #include <linux/version.h>
+#include "compat_xtnu.h"
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 #      warning Kernels below 2.6.22 not supported anymore
@@ -43,6 +44,5 @@
 #endif
 
 #define xt_request_find_match xtnu_request_find_match
-#include "compat_xtnu.h"
 
 #endif /* _XTABLES_COMPAT_H */