diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-15 17:26:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:26 -0500 |
| commit | 84aea6eca58b20f32fad0de0f43d9a5c7de247c9 (patch) | |
| tree | 0dbffc645c0bc534db8d0efc7642cf27ee2c6049 | |
| parent | 5555e28cab5ca003f2876be96eb80046116a62c9 (diff) | |
| download | samba-84aea6eca58b20f32fad0de0f43d9a5c7de247c9.tar.gz samba-84aea6eca58b20f32fad0de0f43d9a5c7de247c9.tar.bz2 samba-84aea6eca58b20f32fad0de0f43d9a5c7de247c9.zip | |
r14455: also add the:
#ifndef FOO
#define FOO
...
#endif
to the client headers
metze
(This used to be commit c0dd773537bda9980e77eb6eda848161b7df82e5)
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 6 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm index 60faa78df3..0f3a86e81e 100644 --- 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 249a1ae194..42375674f5 100644 --- 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 */"; |