summaryrefslogtreecommitdiff
path: root/source4/build/pidl/ndr_parser.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-18 16:31:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:27 -0500
commit327a9ac650d7661a3f94c8e827cd02834550afc4 (patch)
tree70fa28d27d91af0de5d5ba468fae226cb65ada9a /source4/build/pidl/ndr_parser.pm
parent0dde0612b420d12b92d22bd64baa500af2c00b2f (diff)
downloadsamba-327a9ac650d7661a3f94c8e827cd02834550afc4.tar.gz
samba-327a9ac650d7661a3f94c8e827cd02834550afc4.tar.bz2
samba-327a9ac650d7661a3f94c8e827cd02834550afc4.zip
r7729: Small fixes to the charset stuff.
(This used to be commit 5122b9f608399a6c90521e2f8bd96154755fe397)
Diffstat (limited to 'source4/build/pidl/ndr_parser.pm')
-rw-r--r--source4/build/pidl/ndr_parser.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/pidl/ndr_parser.pm b/source4/build/pidl/ndr_parser.pm
index 6bb90f5fcb..a654909e0b 100644
--- a/source4/build/pidl/ndr_parser.pm
+++ b/source4/build/pidl/ndr_parser.pm
@@ -529,7 +529,7 @@ sub ParseElementPushLevel
my $nl = Ndr::GetNextLevel($e, $l);
if (util::has_property($e, "charset")) {
- pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), $e->{PROPERTIES}->{charset}));";
+ pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
} else {
pidl "NDR_CHECK(ndr_push_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
}
@@ -831,7 +831,7 @@ sub ParseElementPullLevel
my $nl = Ndr::GetNextLevel($e, $l);
if (util::has_property($e, "charset")) {
- pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), $e->{PROPERTIES}->{charset}));";
+ pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
} else {
pidl "NDR_CHECK(ndr_pull_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
if ($l->{IS_ZERO_TERMINATED}) {