summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-05-02 13:37:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:26 -0500
commit591ff7675dfe51f30029cb864df47bc8f6266494 (patch)
tree313e307803f243ecb1bec13c6b0fc8eb97be28d7 /source4/build
parentb686e0b9266c0e6029d9f87f187e56c8d2429586 (diff)
downloadsamba-591ff7675dfe51f30029cb864df47bc8f6266494.tar.gz
samba-591ff7675dfe51f30029cb864df47bc8f6266494.tar.bz2
samba-591ff7675dfe51f30029cb864df47bc8f6266494.zip
r6572: add "string_array" as new scalar type for handling SPOOLSS string array's
metze (This used to be commit 23b529ee090e1858fc18794b949f7e466fa82b0e)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/pidl/ndr_header.pm2
-rw-r--r--source4/build/pidl/typelist.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/build/pidl/ndr_header.pm b/source4/build/pidl/ndr_header.pm
index ddd4fa1eb3..f40810a84d 100644
--- a/source4/build/pidl/ndr_header.pm
+++ b/source4/build/pidl/ndr_header.pm
@@ -60,7 +60,7 @@ sub HeaderElement($)
pidl tabs();
HeaderType($element, $element->{TYPE}, "");
pidl " ";
- if ($element->{POINTERS} && $element->{TYPE} ne "string") {
+ if ($element->{POINTERS} && not $element->{TYPE} =~ "string") {
for (my($i)=$element->{POINTERS}; $i > 0; $i--) {
pidl "*";
}
diff --git a/source4/build/pidl/typelist.pm b/source4/build/pidl/typelist.pm
index d9d545f060..9045e86bfd 100644
--- a/source4/build/pidl/typelist.pm
+++ b/source4/build/pidl/typelist.pm
@@ -86,6 +86,10 @@ my $scalars = {
C_TYPE => "const char *",
NDR_ALIGN => 4 #???
},
+ "string_array" => {
+ C_TYPE => "const char **",
+ NDR_ALIGN => 4 #???
+ },
# time types
"time_t" => {