diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-03-24 06:32:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-24 06:32:41 +0000 |
| commit | e20d6bf62b07e455e15b3d8982fb83dc99b9e564 (patch) | |
| tree | 4400fe0ba9baae676633293796954b4061726d5d /config.h | |
| parent | a1ffd5ecfa5d72c6dc4cfaf11653d61e3e9083bc (diff) | |
| parent | ff45753ae3c3108c6c93ec132f7cf62190f9c628 (diff) | |
| download | platform_external_iptables-e20d6bf62b07e455e15b3d8982fb83dc99b9e564.tar.gz platform_external_iptables-e20d6bf62b07e455e15b3d8982fb83dc99b9e564.tar.bz2 platform_external_iptables-e20d6bf62b07e455e15b3d8982fb83dc99b9e564.zip | |
Merge changes from topic 'iptables-1.6.1' am: c784fc47e6
am: ff45753ae3
Change-Id: Ic463667ae6ac346f8eae4b6ca18888dcd24b9d6d
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -20,7 +20,7 @@ #define HAVE_LINUX_MAGIC_H 1 /* Define to 1 if you have the <linux/proc_fs.h> header file. */ -/* #undef HAVE_LINUX_PROC_FS_H */ +#define HAVE_LINUX_PROC_FS_H 1 /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -63,7 +63,7 @@ #define PACKAGE_NAME "iptables" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "iptables 1.4.20" +#define PACKAGE_STRING "iptables 1.6.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "iptables" @@ -72,7 +72,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.20" +#define PACKAGE_VERSION "1.6.1" /* The size of `struct ip6_hdr', as computed by sizeof. */ #define SIZEOF_STRUCT_IP6_HDR 40 @@ -81,4 +81,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.4.20" +#define VERSION "1.6.1" + +/* Location of the iptables lock file */ +#define XT_LOCK_NAME "/system/etc/xtables.lock" |