Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 52 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/CUtil.pm b/source4/pidl/lib/Parse/Pidl/CUtil.pm
deleted file mode 100644
index 9deb6ee177..0000000000
--- a/source4/pidl/lib/Parse/Pidl/CUtil.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-###################################################
-# C utility functions for pidl
-# Copyright jelmer@samba.org 2005-2007
-# released under the GNU GPL
-package Parse::Pidl::CUtil;
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(get_pointer_to get_value_of get_array_element);
-use vars qw($VERSION);
-$VERSION = '0.01';
-
-use strict;
-
-sub get_pointer_to($)
-{
-	my $var_name = shift;
-	
-	if ($var_name =~ /^\*(.*)$/) {
-		return $1;
-	} elsif ($var_name =~ /^\&(.*)$/) {
-		return "&($var_name)";
-	} else {
-		return "&$var_name";
-	}
-}
-
-sub get_value_of($)
-{
-	my $var_name = shift;
-
-	if ($var_name =~ /^\&(.*)$/) {
-		return $1;
-	} else {
-		return "*$var_name";
-	}
-}
-
-sub get_array_element($$)
-{
-	my ($var_name, $idx) = @_;
-
-	if ($var_name =~ /^\*.*$/) {
-		$var_name = "($var_name)";
-	} elsif ($var_name =~ /^\&.*$/) {
-		$var_name = "($var_name)";
-	}
-
-	return "$var_name"."[$idx]";
-}
-
-1;