summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse/Pidl/Samba4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-12 01:22:23 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-12 01:22:23 +0100
commit87fc0a43915fcdce3ac8deea50f3fafffaa42c37 (patch)
tree1e4c79ce42795fad1d0d4655d405254396fdc547 /source4/pidl/lib/Parse/Pidl/Samba4
parent236a780baa959236ff7879d109fa8ba5b067dc88 (diff)
downloadsamba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.tar.gz
samba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.tar.bz2
samba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.zip
pidl: Remove support for the declare keyword in other parts of the pidl code.
(This used to be commit 2fe013f715bdee6c01a833bc6c883e830bdc5dfd)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Samba4')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm2
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index 36cc469ff6..fa0c97961c 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -860,7 +860,7 @@ sub TypeFunctionName($$)
my ($prefix, $t) = @_;
return "$prefix\_$t->{NAME}" if (ref($t) eq "HASH" and
- ($t->{TYPE} eq "TYPEDEF" or $t->{TYPE} eq "DECLARE"));
+ $t->{TYPE} eq "TYPEDEF");
return "$prefix\_$t->{TYPE}_$t->{NAME}" if (ref($t) eq "HASH");
return "$prefix\_$t";
}
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index a261910c17..abbfe2259b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2723,7 +2723,7 @@ sub TypeFunctionName($$)
my ($prefix, $t) = @_;
return "$prefix\_$t->{NAME}" if (ref($t) eq "HASH" and
- ($t->{TYPE} eq "TYPEDEF" or $t->{TYPE} eq "DECLARE"));
+ $t->{TYPE} eq "TYPEDEF");
return "$prefix\_$t->{TYPE}_$t->{NAME}" if (ref($t) eq "HASH");
return "$prefix\_$t";
}