summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-08-05 23:13:08 +0400
committerMatthieu Patou <mat@matws.net>2011-08-06 01:33:07 +0400
commit403f064744e648edc86a6e21b174d92330ef8642 (patch)
treea102754e7a7443f33a98d3982047842f117860cc
parent0912979341045e7d0bdf53bf8c5e855a2fcb7890 (diff)
downloadsamba-403f064744e648edc86a6e21b174d92330ef8642.tar.gz
samba-403f064744e648edc86a6e21b174d92330ef8642.tar.bz2
samba-403f064744e648edc86a6e21b174d92330ef8642.zip
pidl: For wireshark check also LIBNDR_FLAG_NOALIGN for not aligning
-rw-r--r--pidl/lib/Parse/Pidl/Wireshark/NDR.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index b54b8f0af0..45b6c1e5f6 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -639,7 +639,7 @@ sub Struct($$$$)
$self->pidl_code("int old_offset;");
$self->pidl_code("");
- if ($e->{ALIGN} > 1) {
+ if ($e->{ALIGN} > 1 and not property_matches($e, "flag", ".*LIBNDR_FLAG_NOALIGN.*")) {
$self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
}
$self->pidl_code("");