From 11ca21e93c247c74e85ed1ce284893d6b70cd8cf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 5 Jul 2005 10:06:15 +0000 Subject: r8162: Revert my pad8 hack. Andrew Bartlett (This used to be commit 8e78830ffc9280b48e1e690d95a94f1645e6e496) --- source4/build/pidl/ndr.pm | 3 +-- source4/build/pidl/ndr_parser.pm | 6 ------ source4/build/pidl/validator.pm | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'source4/build') diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm index c4ff1d8a89..2bf673b5e3 100644 --- a/source4/build/pidl/ndr.pm +++ b/source4/build/pidl/ndr.pm @@ -166,8 +166,7 @@ sub GetElementLevelTable($) SUBCONTEXT_SIZE => $subsize, IS_DEFERRED => $is_deferred, COMPRESSION => util::has_property($e, "compression"), - OBFUSCATION => util::has_property($e, "obfuscation"), - PAD8 => util::has_property($e, "pad8") + OBFUSCATION => util::has_property($e, "obfuscation") }); } diff --git a/source4/build/pidl/ndr_parser.pm b/source4/build/pidl/ndr_parser.pm index 48e243aa0c..ba6b9d58da 100644 --- a/source4/build/pidl/ndr_parser.pm +++ b/source4/build/pidl/ndr_parser.pm @@ -452,9 +452,6 @@ sub ParseSubcontextPushEnd($$$$) pidl "NDR_CHECK(ndr_push_subcontext_header(ndr, $l->{HEADER_SIZE}, $subcontext_size, $ndr));"; pidl "NDR_CHECK(ndr_push_bytes(ndr, $ndr->data, $ndr->offset));"; - if (defined $l->{PAD8}) { - pidl "NDR_CHECK(ndr_push_align(ndr, 8));"; - } deindent; pidl "}"; } @@ -504,9 +501,6 @@ sub ParseSubcontextPullEnd($$$) $advance = "$ndr->offset"; } pidl "NDR_CHECK(ndr_pull_advance(ndr, $advance));"; - if (defined $l->{PAD8}) { - pidl "NDR_CHECK(ndr_pull_align(ndr, 8));"; - } deindent; pidl "}"; } diff --git a/source4/build/pidl/validator.pm b/source4/build/pidl/validator.pm index f1677d1ae7..fbf7993b20 100644 --- a/source4/build/pidl/validator.pm +++ b/source4/build/pidl/validator.pm @@ -106,7 +106,6 @@ my %property_list = ( "default" => ["ELEMENT"], # subcontext - "pad8" => ["ELEMENT"], "subcontext" => ["ELEMENT"], "subcontext_size" => ["ELEMENT"], "compression" => ["ELEMENT"], -- cgit