r14455: also add the:

#ifndef FOO
#define FOO
...
#endif

to the client headers

metze
(This used to be commit c0dd773537bda9980e77eb6eda848161b7df82e5)

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 60faa78df387716bb9541a722237e0570c38856b..0f3a86e81ee26004ef8c7396c8e14e0171503bb2 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -66,6 +66,10 @@ my %done;
 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 @@ sub ParseInterface($)
                $done{$fn->{NAME}} = 1;
        }
 
+       $res_hdr .= "#endif /* _HEADER_RPC_$interface->{NAME} */\n";
+
        return $res;
 }
 

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 249a1ae194f0ed19212f88c3d3d588c560a88a3f..42375674f5f30c522030f954a3ac5b21ce3df8e3 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2301,8 +2301,8 @@ sub ParseInterface($$)
 {
        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 @@ sub ParseInterface($$)
 
        FunctionTable($interface);
 
-       pidl_hdr "#endif /* _HEADER_RPC_$interface->{NAME} */";
+       pidl_hdr "#endif /* _HEADER_NDR_$interface->{NAME} */";
 }
 
 #####################################################################
@@ -2351,7 +2351,7 @@ sub Parse($$)
        $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 */";