summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-10-14 06:35:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:52 -0500
commit1ddb14e22e75e2862ddf036ff065df4bbfca5515 (patch)
tree6425c3bacc05d62504791e6e5d3cacd7c22cc87b /source4
parent9fb065f2a6798233525042c00beee23a8130864a (diff)
downloadsamba-1ddb14e22e75e2862ddf036ff065df4bbfca5515.tar.gz
samba-1ddb14e22e75e2862ddf036ff065df4bbfca5515.tar.bz2
samba-1ddb14e22e75e2862ddf036ff065df4bbfca5515.zip
r2963: Handle structures that contain more than one union as members.
(This used to be commit 6a47a079c003c2a139665ad2b5ede5d139049bd1)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/swig.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/pidl/swig.pm b/source4/build/pidl/swig.pm
index 7fad25d258..1ddb54c77b 100644
--- a/source4/build/pidl/swig.pm
+++ b/source4/build/pidl/swig.pm
@@ -216,7 +216,7 @@ sub FieldToPython($$)
my($extra_args) = "";
if (isunion($e->{TYPE})) {
- $extra_args = ", switch_is";
+ $extra_args = ", $e->{NAME}_switch_is";
}
if ($e->{POINTERS} == 0) {
@@ -291,7 +291,7 @@ sub ParseFunction($)
foreach my $e (@{$fn->{DATA}}) {
if (isunion($e->{TYPE})) {
- $result .= ", int switch_is";
+ $result .= ", int $e->{NAME}_switch_is";
}
}
$result .= ")\n";