diff options
| -rw-r--r-- | source4/build/pidl/header.pm | 8 | ||||
| -rw-r--r-- | source4/build/pidl/util.pm | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source4/build/pidl/header.pm b/source4/build/pidl/header.pm index 83e2cfd4ac..ec8b8451ad 100644 --- a/source4/build/pidl/header.pm +++ b/source4/build/pidl/header.pm @@ -125,11 +125,11 @@ sub HeaderType($$$) HeaderUnion($data, $name); return; } - if ($data =~ "unistr") { + if ($data =~ "unistr" || + $data =~ "ascstr") { $res .= "const char"; - } elsif ($data =~ "nstring") { - $res .= "const char *"; - } elsif ($data =~ "lstring") { + } elsif ($data =~ "nstring" || + $data =~ "lstring") { $res .= "const char *"; } elsif (util::is_scalar_type($data)) { $res .= "$data"; diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm index c3f46dc817..566253699d 100644 --- a/source4/build/pidl/util.pm +++ b/source4/build/pidl/util.pm @@ -223,7 +223,7 @@ sub is_builtin_type($) return 1, if (is_scalar_type($type)); return 1, if ($type =~ "unistr.*"); - return 1, if ($type eq "policy_handle"); + return 1, if ($type =~ "ascstr.*"); return 0; } @@ -329,6 +329,7 @@ sub c_pull_prefix($) if ($e->{TYPE} =~ "unistr.*" || $e->{TYPE} =~ "nstring.*" || + $e->{TYPE} =~ "ascstr.*" || $e->{TYPE} =~ "lstring.*") { return "&"; } |