From ecf0dd6bafaa95692c3ece94b6f71446cd54ebdc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 16 Mar 2006 20:02:31 +0000
Subject: r14488: Install more headers. Generate different #include lines in
 pidl depending on whether we're building inside or outside of the Samba tree
 (useful for 3rd-party projects). (This used to be commit
 0c188833154c1fe565cb1735909e408a4a1a6049)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 source4/pidl/lib/Parse/Pidl/Samba4.pm

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
new file mode 100644
index 0000000000..0a284aa85b
--- /dev/null
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -0,0 +1,32 @@
+###################################################
+# Common Samba4 functions
+# Copyright jelmer@samba.org 2006
+# released under the GNU GPL
+
+package Parse::Pidl::Samba4;
+
+require Exporter;
+@ISA = qw(Exporter);
+@EXPORT = qw(is_intree choose_header);
+
+use Parse::Pidl::Util qw(has_property);
+use strict;
+
+use vars qw($VERSION);
+$VERSION = '0.01';
+
+sub is_intree()
+{
+	return -f "include/smb.h";
+}
+
+# Return an #include line depending on whether this build is an in-tree
+# build or not.
+sub choose_header($$)
+{
+	my ($in,$out) = @_;
+	return "#include \"$in\"" if (is_intree());
+	return "#include <$out>";
+}
+
+1;
-- 
cgit 


From 8d6249814f45e95a9941dfc7d6d3d2a93811efb0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 13 May 2006 22:03:44 +0000
Subject: r15587: Generate stubs for the SWIG functions (This used to be commit
 746d0a7fa7a43685e6ebb4877bb5459101e51ed1)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 41 +++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 0a284aa85b..2d710f3eb6 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -7,9 +7,10 @@ package Parse::Pidl::Samba4;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(is_intree choose_header);
+@EXPORT = qw(is_intree choose_header DeclLong);
 
-use Parse::Pidl::Util qw(has_property);
+use Parse::Pidl::Util qw(has_property is_constant);
+use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
 use strict;
 
 use vars qw($VERSION);
@@ -29,4 +30,40 @@ sub choose_header($$)
 	return "#include <$out>";
 }
 
+sub DeclLong($)
+{
+	my($element) = shift;
+	my $ret = "";
+
+	if (has_property($element, "represent_as")) {
+		$ret.=mapType($element->{PROPERTIES}->{represent_as})." ";
+	} else {
+		if (has_property($element, "charset")) {
+			$ret.="const char";
+		} else {
+			$ret.=mapType($element->{TYPE});
+		}
+
+		$ret.=" ";
+		my $numstar = $element->{ORIGINAL}->{POINTERS};
+		if ($numstar >= 1) {
+			$numstar-- if scalar_is_reference($element->{TYPE});
+		}
+		foreach (@{$element->{ORIGINAL}->{ARRAY_LEN}})
+		{
+			next if is_constant($_) and 
+				not has_property($element, "charset");
+			$numstar++;
+		}
+		$ret.="*" foreach (1..$numstar);
+	}
+	$ret.=$element->{NAME};
+	foreach (@{$element->{ARRAY_LEN}}) {
+		next unless (is_constant($_) and not has_property($element, "charset"));
+		$ret.="[$_]";
+	}
+
+	return $ret;
+}
+
 1;
-- 
cgit 


From 0329d755a7611ba3897fc1ee9bdce410cc33d7f8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 30 Aug 2006 11:29:34 +0000
Subject: r17930: Merge noinclude branch:  * Move dlinklist.h, smb.h to
 subsystem-specific directories  * Clean up ads.h and move what is left of it
 to dsdb/    (only place where it's used) (This used to be commit
 f7afa1cb77f3cfa7020b57de12e6003db7cfcc42)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 2d710f3eb6..35456b1cfb 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -18,7 +18,7 @@ $VERSION = '0.01';
 
 sub is_intree()
 {
-	return -f "include/smb.h";
+	return -f "kdc/kdc.c";
 }
 
 # Return an #include line depending on whether this build is an in-tree
-- 
cgit 


From 4dff1f05f00560adc1deeb09b5e27dacad787783 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 7 Sep 2006 19:46:23 +0000
Subject: r18227: Recognize Samba3 in-tree builds. (This used to be commit
 5055430ddfca02a962827bbedf7fbd9987992953)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 35456b1cfb..eac5104da2 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -18,7 +18,7 @@ $VERSION = '0.01';
 
 sub is_intree()
 {
-	return -f "kdc/kdc.c";
+	return (-f "kdc/kdc.c" or -f "include/smb.h");
 }
 
 # Return an #include line depending on whether this build is an in-tree
-- 
cgit 


From 433ec0ba664c9eb53b26550e25973e2fc538646b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 7 Sep 2006 20:01:17 +0000
Subject: r18228: Don't include Samba4-specific headers when building inside a
 Samba3 tree. (This used to be commit
 d0f0d4600acad71ea4993f4e356735433d9bc5f0)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index eac5104da2..4ef2daa591 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -18,7 +18,9 @@ $VERSION = '0.01';
 
 sub is_intree()
 {
-	return (-f "kdc/kdc.c" or -f "include/smb.h");
+	return 4 if (-f "kdc/kdc.c");
+	return 3 if (-f "include/smb.h");
+	return 0;
 }
 
 # Return an #include line depending on whether this build is an in-tree
-- 
cgit 


From f4c4e0cf7fde6c5b5cffef2e3ad4ec24bb8fb894 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 19 Nov 2006 17:56:35 +0000
Subject: r19790: Check in the PIDL change and the converted unixinfo and
 winbind pipes without waiting for comments. This is what version control is
 for, and it does fix a segfault I ran into ;-)

Nevertheless, Jelmer & Jerry, please take a look!

Thanks,

Volker
(This used to be commit 10dcaf89ed07b9d5d1c89da33b50fcaadead32b2)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 4ef2daa591..e11bd6a5ff 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -7,7 +7,7 @@ package Parse::Pidl::Samba4;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(is_intree choose_header DeclLong);
+@EXPORT = qw(is_intree choose_header DeclLong DeclLong_cli IsUniqueOut);
 
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
@@ -32,9 +32,19 @@ sub choose_header($$)
 	return "#include <$out>";
 }
 
-sub DeclLong($)
+sub IsUniqueOut($)
 {
-	my($element) = shift;
+    my ($e) = shift;
+
+    return grep(/out/, @{$e->{DIRECTION}}) &&
+	((($e->{LEVELS}[0]->{TYPE} eq "POINTER") &&
+	  ($e->{LEVELS}[0]->{POINTER_TYPE} eq "unique")) ||
+	 ($e->{LEVELS}[0]->{TYPE} eq "ARRAY"));
+}
+
+sub DeclLong_int($$)
+{
+	my($element,$cli) = @_;
 	my $ret = "";
 
 	if (has_property($element, "represent_as")) {
@@ -57,6 +67,9 @@ sub DeclLong($)
 				not has_property($element, "charset");
 			$numstar++;
 		}
+		if ($cli && IsUniqueOut($element)) {
+			$numstar++;
+		}
 		$ret.="*" foreach (1..$numstar);
 	}
 	$ret.=$element->{NAME};
@@ -68,4 +81,14 @@ sub DeclLong($)
 	return $ret;
 }
 
+sub DeclLong($)
+{
+    return DeclLong_int($_, 0);
+}
+
+sub DeclLong_cli($)
+{
+    return DeclLong_int($_, 1);
+}
+
 1;
-- 
cgit 


From 85520faa42647c9d7ee7e519d4f2139de82ae4a9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Jan 2007 15:51:37 +0000
Subject: r20834: No longer generate extra pointers for top-level [out] unique
 pointers. (This used to be commit b967f5851f24a4716d386fc569e384b9320b162a)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index e11bd6a5ff..4ef2daa591 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -7,7 +7,7 @@ package Parse::Pidl::Samba4;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(is_intree choose_header DeclLong DeclLong_cli IsUniqueOut);
+@EXPORT = qw(is_intree choose_header DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
@@ -32,19 +32,9 @@ sub choose_header($$)
 	return "#include <$out>";
 }
 
-sub IsUniqueOut($)
-{
-    my ($e) = shift;
-
-    return grep(/out/, @{$e->{DIRECTION}}) &&
-	((($e->{LEVELS}[0]->{TYPE} eq "POINTER") &&
-	  ($e->{LEVELS}[0]->{POINTER_TYPE} eq "unique")) ||
-	 ($e->{LEVELS}[0]->{TYPE} eq "ARRAY"));
-}
-
-sub DeclLong_int($$)
+sub DeclLong($)
 {
-	my($element,$cli) = @_;
+	my($element) = shift;
 	my $ret = "";
 
 	if (has_property($element, "represent_as")) {
@@ -67,9 +57,6 @@ sub DeclLong_int($$)
 				not has_property($element, "charset");
 			$numstar++;
 		}
-		if ($cli && IsUniqueOut($element)) {
-			$numstar++;
-		}
 		$ret.="*" foreach (1..$numstar);
 	}
 	$ret.=$element->{NAME};
@@ -81,14 +68,4 @@ sub DeclLong_int($$)
 	return $ret;
 }
 
-sub DeclLong($)
-{
-    return DeclLong_int($_, 0);
-}
-
-sub DeclLong_cli($)
-{
-    return DeclLong_int($_, 1);
-}
-
 1;
-- 
cgit 


From 0515f728e64dde0c197aee6180dce79ad281d5f8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 Feb 2007 18:44:56 +0000
Subject: r21433: Get rid of the COM support code - it's not used and
 unmaintained. We can always bring it back if we need to. This code was
 getting in the way while refactoring.

Add some tests for TDR.

Get rid of typedef in lib/registry/tdr_regf.idl and fix the
TDR code to be able to deal with it.
(This used to be commit 1ad0f99a439f0d52a735b391bf9900d50171aca5)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 4ef2daa591..f0c6ae38e8 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -10,7 +10,7 @@ require Exporter;
 @EXPORT = qw(is_intree choose_header DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
-use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
+use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference);
 use strict;
 
 use vars qw($VERSION);
@@ -38,12 +38,12 @@ sub DeclLong($)
 	my $ret = "";
 
 	if (has_property($element, "represent_as")) {
-		$ret.=mapType($element->{PROPERTIES}->{represent_as})." ";
+		$ret.=mapTypeName($element->{PROPERTIES}->{represent_as})." ";
 	} else {
 		if (has_property($element, "charset")) {
 			$ret.="const char";
 		} else {
-			$ret.=mapType($element->{TYPE});
+			$ret.=mapTypeName($element->{TYPE});
 		}
 
 		$ret.=" ";
-- 
cgit 


From 2882b2ba63ea65c806643f86d996513414c827d0 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Mon, 2 Apr 2007 17:06:14 +0000
Subject: r22029: Make sure we respect $srcdir correctly for the srcdir !=
 builddir case. (This used to be commit
 0db4256a472975c5097135fa87315038a1350a72)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index f0c6ae38e8..f6c0ee38f7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -18,8 +18,10 @@ $VERSION = '0.01';
 
 sub is_intree()
 {
-	return 4 if (-f "kdc/kdc.c");
-	return 3 if (-f "include/smb.h");
+	my $srcdir = $ENV{srcdir};
+	$srcdir = $srcdir ? "$srcdir/" : "";
+	return 4 if (-f "${srcdir}kdc/kdc.c");
+	return 3 if (-f "${srcdir}include/smb.h");
 	return 0;
 }
 
-- 
cgit 


From 2b3161d8de92528be192f593256e97ec9658f88b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 14 Aug 2007 11:50:45 +0000
Subject: r24407: $element->{ARRAY_LEN} doesn't exist...

and a few lines above we use $element->{ORIGINAL}->{ARRAY_LEN}
I assume it was just forgotten in the update.

metze
(This used to be commit 89ea0339b5f95b27ad0eaed430d1f264722a7e84)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index f6c0ee38f7..326ac83751 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -62,7 +62,7 @@ sub DeclLong($)
 		$ret.="*" foreach (1..$numstar);
 	}
 	$ret.=$element->{NAME};
-	foreach (@{$element->{ARRAY_LEN}}) {
+	foreach (@{$element->{ORIGINAL}->{ARRAY_LEN}}) {
 		next unless (is_constant($_) and not has_property($element, "charset"));
 		$ret.="[$_]";
 	}
-- 
cgit 


From 3e3e5f85ddb407615e5d6a73fc5ec11acac4108e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2007 13:01:51 +0000
Subject: r24518: get rid of using ->{ORIGINAL} and move stuff into
 subfunctions

metze
(This used to be commit ff7fa11e70018e9691441d824483b803781943a7)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 95 ++++++++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 25 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 326ac83751..ebe74d488d 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -10,6 +10,7 @@ require Exporter;
 @EXPORT = qw(is_intree choose_header DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
+use Parse::Pidl::NDR qw(GetNextLevel);
 use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference);
 use strict;
 
@@ -34,40 +35,84 @@ sub choose_header($$)
 	return "#include <$out>";
 }
 
+sub NumStars($;$)
+{
+	my ($e, $d) = @_;
+	$d = 0 unless defined($d);
+	my $n = 0;
+
+	foreach my $l (@{$e->{LEVELS}}) {
+		next unless ($l->{TYPE} eq "POINTER");
+
+		my $nl = GetNextLevel($e, $l);
+		next if (defined($nl) and $nl->{TYPE} eq "ARRAY");
+
+		$n++;
+	}
+
+	if ($n >= 1) {
+		$n-- if (scalar_is_reference($e->{TYPE}));
+	}
+
+	foreach my $l (@{$e->{LEVELS}}) {
+		next unless ($l->{TYPE} eq "ARRAY");
+		next if ($l->{IS_FIXED}) and not has_property($e, "charset");
+		$n++;
+	}
+
+	fatal($e->{ORIGINAL}, "Too few pointers $n < $d") if ($n < $d);
+
+	$n -= $d;
+
+	return $n;
+}
+
+sub ElementStars($;$)
+{
+	my ($e, $d) = @_;
+	my $res = "";
+	my $n = 0;
+
+	$n = NumStars($e, $d);
+	$res .= "*" foreach (1..$n);
+
+	return $res;
+}
+
+sub ArrayBrackets($)
+{
+	my ($e) = @_;
+	my $res = "";
+
+	foreach my $l (@{$e->{LEVELS}}) {
+		next unless ($l->{TYPE} eq "ARRAY");
+		next unless ($l->{IS_FIXED}) and not has_property($e, "charset");
+		$res .= "[$l->{SIZE_IS}]";
+	}
+
+	return $res;
+}
+
 sub DeclLong($)
 {
-	my($element) = shift;
-	my $ret = "";
+	my ($e, $d) = shift;
+	my $res = "";
 
-	if (has_property($element, "represent_as")) {
-		$ret.=mapTypeName($element->{PROPERTIES}->{represent_as})." ";
+	if (has_property($e, "represent_as")) {
+		$res .= mapTypeName($e->{PROPERTIES}->{represent_as})." ";
 	} else {
-		if (has_property($element, "charset")) {
-			$ret.="const char";
+		if (has_property($e, "charset")) {
+			$res .= "const char ";
 		} else {
-			$ret.=mapTypeName($element->{TYPE});
+			$res .= mapTypeName($e->{TYPE})." ";
 		}
 
-		$ret.=" ";
-		my $numstar = $element->{ORIGINAL}->{POINTERS};
-		if ($numstar >= 1) {
-			$numstar-- if scalar_is_reference($element->{TYPE});
-		}
-		foreach (@{$element->{ORIGINAL}->{ARRAY_LEN}})
-		{
-			next if is_constant($_) and 
-				not has_property($element, "charset");
-			$numstar++;
-		}
-		$ret.="*" foreach (1..$numstar);
-	}
-	$ret.=$element->{NAME};
-	foreach (@{$element->{ORIGINAL}->{ARRAY_LEN}}) {
-		next unless (is_constant($_) and not has_property($element, "charset"));
-		$ret.="[$_]";
+		$res .= ElementStars($e);
 	}
+	$res .= $e->{NAME};
+	$res .= ArrayBrackets($e);
 
-	return $ret;
+	return $res;
 }
 
 1;
-- 
cgit 


From 95d4e550bd66cefe19396387ad52fb3cec5d0b64 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2007 13:08:00 +0000
Subject: r24520: make use of the new ElementStars() and ArrayBrackets()
 functions

metze
(This used to be commit fad5af2f2069993b7284e74a177b78a4b4798383)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index ebe74d488d..347d288cee 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -7,7 +7,7 @@ package Parse::Pidl::Samba4;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(is_intree choose_header DeclLong);
+@EXPORT = qw(is_intree choose_header NumStars ElementStars ArrayBrackets DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::NDR qw(GetNextLevel);
-- 
cgit 


From 25dbce70b74cb6a17a80a0ea0cc0646fca975658 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2007 13:42:09 +0000
Subject: r24521: we don't yet have optional args to DeclLong()

metze
(This used to be commit 66d4d6f19643454fb781cebbca2c4f4dbb94e90b)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 347d288cee..5848543a60 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -95,7 +95,7 @@ sub ArrayBrackets($)
 
 sub DeclLong($)
 {
-	my ($e, $d) = shift;
+	my ($e) = shift;
 	my $res = "";
 
 	if (has_property($e, "represent_as")) {
-- 
cgit 


From af163d258cfeee2a908e297256570a2bfcc8b651 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 16 Jan 2008 15:06:46 +0100
Subject: pidl: Fix missing import for fatal(). (This used to be commit
 6a9827454aaf4279ee85dc5d99d10f14e4c09eae)

---
 source4/pidl/lib/Parse/Pidl/Samba4.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index 5848543a60..d42e01cdb0 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -12,6 +12,7 @@ require Exporter;
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::NDR qw(GetNextLevel);
 use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference);
+use Parse::Pidl qw(fatal);
 use strict;
 
 use vars qw($VERSION);
-- 
cgit