svn commit: samba r14455 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR: .

metze at samba.org metze at samba.org
Wed Mar 15 17:26:54 GMT 2006


Author: metze
Date: 2006-03-15 17:26:53 +0000 (Wed, 15 Mar 2006)
New Revision: 14455

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14455

Log:
also add the:

#ifndef FOO
#define FOO
...
#endif

to the client headers

metze
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm	2006-03-15 16:37:37 UTC (rev 14454)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm	2006-03-15 17:26:53 UTC (rev 14455)
@@ -66,6 +66,10 @@
 sub ParseInterface($)
 {
 	my($interface) = shift;
+
+	$res_hdr .= "#ifndef _HEADER_RPC_$interface->{NAME}\n";
+	$res_hdr .= "#define _HEADER_RPC_$interface->{NAME}\n\n";
+
 	$res .= "/* $interface->{NAME} - client functions generated by pidl */\n\n";
 
 	foreach my $fn (@{$interface->{FUNCTIONS}}) {
@@ -75,6 +79,8 @@
 		$done{$fn->{NAME}} = 1;
 	}
 
+	$res_hdr .= "#endif /* _HEADER_RPC_$interface->{NAME} */\n";
+
 	return $res;
 }
 

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-15 16:37:37 UTC (rev 14454)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-15 17:26:53 UTC (rev 14455)
@@ -2301,8 +2301,8 @@
 {
 	my($interface,$needed) = @_;
 
-	pidl_hdr "#ifndef _HEADER_RPC_$interface->{NAME}";
-	pidl_hdr "#define _HEADER_RPC_$interface->{NAME}";
+	pidl_hdr "#ifndef _HEADER_NDR_$interface->{NAME}";
+	pidl_hdr "#define _HEADER_NDR_$interface->{NAME}";
 
 	pidl_hdr "";
 
@@ -2338,7 +2338,7 @@
 
 	FunctionTable($interface);
 
-	pidl_hdr "#endif /* _HEADER_RPC_$interface->{NAME} */";
+	pidl_hdr "#endif /* _HEADER_NDR_$interface->{NAME} */";
 }
 
 #####################################################################
@@ -2351,7 +2351,7 @@
 	$res = "";
 
 	$res_hdr = "";
-    pidl_hdr "/* header auto-generated by pidl */";
+	pidl_hdr "/* header auto-generated by pidl */";
 	pidl_hdr "";
 
 	pidl "/* parser auto-generated by pidl */";



More information about the samba-cvs mailing list