diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-26 22:47:40 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:46 -0500 |
commit | c1c01df22f7145ca86b97fce670131017b3df3b9 (patch) | |
tree | 6520734cb8e389ece00cd8c48a0cce0dbb8049fd /source4/pidl/pidl | |
parent | 09c44f6cae89621871d2e5475b0c0f99c25804b4 (diff) | |
download | samba-c1c01df22f7145ca86b97fce670131017b3df3b9.tar.gz samba-c1c01df22f7145ca86b97fce670131017b3df3b9.tar.bz2 samba-c1c01df22f7145ca86b97fce670131017b3df3b9.zip |
r12501: Merge EJSHeader.pm into EJS.pm and simplify smbcalls_rpc.c a bit,
now that it is guaranteed that the smbcalls modules are always initialized
after the EJS subsystem itself.
(This used to be commit 1e8670874bb7415c3e00a42516680fdb4ee2fca1)
Diffstat (limited to 'source4/pidl/pidl')
-rwxr-xr-x | source4/pidl/pidl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/pidl/pidl b/source4/pidl/pidl index d1b8c4480b..dcf5850774 100755 --- a/source4/pidl/pidl +++ b/source4/pidl/pidl @@ -675,10 +675,9 @@ sub process_file($) if (defined($opt_ejs)) { require Parse::Pidl::Samba4::EJS; - require Parse::Pidl::Samba4::EJSHeader; - FileSave("$outputdir/ndr_$basename\_ejs.c", Parse::Pidl::Samba4::EJS::Parse($ndr, $h_filename)); - - FileSave("$outputdir/ndr_$basename\_ejs.h", Parse::Pidl::Samba4::EJSHeader::Parse($ndr)); + my ($hdr,$prsr) = Parse::Pidl::Samba4::EJS::Parse($ndr, $h_filename); + FileSave("$outputdir/ndr_$basename\_ejs.c", $prsr); + FileSave("$outputdir/ndr_$basename\_ejs.h", $hdr); } if (defined($opt_server)) { |