From: Jan Engelhardt <jengelh@medozas.de>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH 3/5] build: fix struct size mismatch
Date: Sat, 25 Jul 2009 22:22:41 +0200 [thread overview]
Message-ID: <1248553363-26903-4-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1248553363-26903-1-git-send-email-jengelh@medozas.de>
Mixing code compiled with and without -DNO_SHARED_LIBS is fine as
long as the structs have the same layout. This patch prevents a
potential (currently non-triggerable) "ip6tables: target (null)<123>
is missing a version" error.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/xtables.h.in | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/include/xtables.h.in b/include/xtables.h.in
index 222e2a9..7468302 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -90,9 +90,7 @@ struct xtables_match
unsigned int option_offset;
struct xt_entry_match *m;
unsigned int mflags;
-#ifdef NO_SHARED_LIBS
unsigned int loaded; /* simulate loading so options are merged properly */
-#endif
};
struct xtables_target
@@ -152,9 +150,7 @@ struct xtables_target
struct xt_entry_target *t;
unsigned int tflags;
unsigned int used;
-#ifdef NO_SHARED_LIBS
unsigned int loaded; /* simulate loading so options are merged properly */
-#endif
};
struct xtables_rule_match {
--
1.6.3.3
next prev parent reply other threads:[~2009-07-25 20:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-25 20:22 (unknown), Jan Engelhardt
2009-07-25 20:22 ` [PATCH 1/5] build: order of dependent libs is sensitive Jan Engelhardt
2009-07-25 20:22 ` [PATCH 2/5] multi binary: allow subcommand via argv[1] Jan Engelhardt
2009-07-25 20:22 ` Jan Engelhardt [this message]
2009-07-25 20:22 ` [PATCH 4/5] build: combine iptables-multi and iptables-static Jan Engelhardt
2009-07-25 20:22 ` [PATCH 5/5] build: build only iptables-multi Jan Engelhardt
2009-08-03 13:45 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1248553363-26903-4-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).