aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-04-08 07:44:32 -0700
committerMaciej Żenczykowski <maze@google.com>2020-04-16 02:36:54 +0000
commit16562a776a33f7ccef0fd61a49b418c95bc17848 (patch)
treed3989e154af125b33643cb4e5b92b569cfb65917
parent3fbfcba73bc49c4ca34b092714e2e0058e61b908 (diff)
downloadiptables-16562a776a33f7ccef0fd61a49b418c95bc17848.tar.gz
regenerate config.h
Besides the version change, and the reordering this is a no-op. The removal of HAVE_LINUX_PROC_FS_H was for Linux 2.4 support, but we have HAVE_LINUX_MAGIC_H defined anyway, and the only use is in libxtables/xtables.c: #if defined(HAVE_LINUX_MAGIC_H) # include <linux/magic.h> /* for PROC_SUPER_MAGIC */ #elif defined(HAVE_LINUX_PROC_FS_H) # include <linux/proc_fs.h> /* Linux 2.4 */ #else # define PROC_SUPER_MAGIC 0x9fa0 #endif Generated via: sudo apt-get install automake libtool ./autogen.sh chown maze:eng config.h.in ./configure --disable-nftables --disable-connlabel --with-xt-lock-name=/system/etc/xtables.lock --enable-static --disable-shared Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I2b767372f45adcf9d4052bf574855f466dd0218f
-rw-r--r--config.h20
1 files changed, 8 insertions, 12 deletions
diff --git a/config.h b/config.h
index 21ae69c9..9c304c18 100644
--- a/config.h
+++ b/config.h
@@ -10,6 +10,9 @@
/* Define to 1 if you have the `pcap' library (-lpcap). */
/* #undef HAVE_LIBPCAP */
+/* Define to 1 if you have the <linux/bpf.h> header file. */
+#define HAVE_LINUX_BPF_H 1
+
/* Define to 1 if you have the <linux/dccp.h> header file. */
#define HAVE_LINUX_DCCP_H 1
@@ -20,7 +23,7 @@
#define HAVE_LINUX_MAGIC_H 1
/* Define to 1 if you have the <linux/proc_fs.h> header file. */
-#define HAVE_LINUX_PROC_FS_H 1
+/* #undef HAVE_LINUX_PROC_FS_H */
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -46,13 +49,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
/* Name of package */
#define PACKAGE "iptables"
@@ -63,7 +62,7 @@
#define PACKAGE_NAME "iptables"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "iptables 1.6.2"
+#define PACKAGE_STRING "iptables 1.8.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "iptables"
@@ -72,7 +71,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.2"
+#define PACKAGE_VERSION "1.8.4"
/* The size of `struct ip6_hdr', as computed by sizeof. */
#define SIZEOF_STRUCT_IP6_HDR 40
@@ -81,10 +80,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.6.2"
+#define VERSION "1.8.4"
/* Location of the iptables lock file */
#define XT_LOCK_NAME "/system/etc/xtables.lock"
-
-/* Define to 1 if you have the <linux/bpf.h> header file. */
-#define HAVE_LINUX_BPF_H 1