|
 |
4aca6e |
From d7885e6a737866ada8445fd86c6352ac5ba96d7d Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 4 Apr 2017 16:26:50 +0200
|
|
|
4aca6e |
Subject: [PATCH] tc: m_xt: Drop needless parentheses from #if checks
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1326726
|
|
|
4aca6e |
Upstream Status: iproute2.git commit a05b9557f48e2
|
|
|
4aca6e |
|
|
|
4aca6e |
commit a05b9557f48e23e69a4c1a597f2f288f133ef170
|
|
|
4aca6e |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
Date: Fri Jan 13 13:06:19 2017 +0100
|
|
|
4aca6e |
|
|
|
4aca6e |
tc: m_xt: Drop needless parentheses from #if checks
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
tc/m_xt.c | 8 ++++----
|
|
|
4aca6e |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/tc/m_xt.c b/tc/m_xt.c
|
|
|
4aca6e |
index 890dddd..478523d 100644
|
|
|
4aca6e |
--- a/tc/m_xt.c
|
|
|
4aca6e |
+++ b/tc/m_xt.c
|
|
|
4aca6e |
@@ -77,7 +77,7 @@ static struct xtables_globals tcipt_globals = {
|
|
|
4aca6e |
.orig_opts = original_opts,
|
|
|
4aca6e |
.opts = original_opts,
|
|
|
4aca6e |
.exit_err = NULL,
|
|
|
4aca6e |
-#if (XTABLES_VERSION_CODE >= 11)
|
|
|
4aca6e |
+#if XTABLES_VERSION_CODE >= 11
|
|
|
4aca6e |
.compat_rev = xtables_compatible_revision,
|
|
|
4aca6e |
#endif
|
|
|
4aca6e |
};
|
|
|
4aca6e |
@@ -126,7 +126,7 @@ static int get_xtables_target_opts(struct xtables_globals *globals,
|
|
|
4aca6e |
{
|
|
|
4aca6e |
struct option *opts;
|
|
|
4aca6e |
|
|
|
4aca6e |
-#if (XTABLES_VERSION_CODE >= 6)
|
|
|
4aca6e |
+#if XTABLES_VERSION_CODE >= 6
|
|
|
4aca6e |
opts = xtables_options_xfrm(globals->orig_opts,
|
|
|
4aca6e |
globals->opts,
|
|
|
4aca6e |
m->x6_options,
|
|
|
4aca6e |
@@ -204,7 +204,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
|
|
|
4aca6e |
break;
|
|
|
4aca6e |
|
|
|
4aca6e |
default:
|
|
|
4aca6e |
-#if (XTABLES_VERSION_CODE >= 6)
|
|
|
4aca6e |
+#if XTABLES_VERSION_CODE >= 6
|
|
|
4aca6e |
if (m != NULL && m->x6_parse != NULL) {
|
|
|
4aca6e |
xtables_option_tpcall(c, argv, 0, m, NULL);
|
|
|
4aca6e |
#else
|
|
|
4aca6e |
@@ -242,7 +242,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
/* check that we passed the correct parameters to the target */
|
|
|
4aca6e |
-#if (XTABLES_VERSION_CODE >= 6)
|
|
|
4aca6e |
+#if XTABLES_VERSION_CODE >= 6
|
|
|
4aca6e |
if (m)
|
|
|
4aca6e |
xtables_option_tfcall(m);
|
|
|
4aca6e |
#else
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|