osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update from samba tree revision 25198 to 25306 

============================ Samba log start ============
------------------------------------------------------------------------
r25301 | jelmer | 2007-09-23 23:35:03 +0200 (Sun, 23 Sep 2007) | 1 line
   A /branches/SAMBA_4_0/source/libcli/raw/clierror.c (from /branches/SAMBA_4_0/source/libcli/util/clierror.c:25300)
   D /branches/SAMBA_4_0/source/libcli/util/clierror.c
   D /branches/SAMBA_4_0/source/libcli/util/nt_status.h
   D /branches/SAMBA_4_0/source/libcli/util/nterr.h
   A /branches/SAMBA_4_0/source/libcli/util/ntstatus.h (from /branches/SAMBA_4_0/source/libcli/util/nterr.h:25300)
   A /branches/SAMBA_4_0/source/libcli/util/werror.h (from /branches/SAMBA_4_0/source/libcli/util/nt_status.h:25300)

Merge my includes.h cleanups.
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============


svn path=/trunk/; revision=22939
This commit is contained in:
Jörg Mayer 2007-09-24 16:05:51 +00:00
parent 0cb93f22ba
commit af5de71e06
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/pidl/lib/Parse/Pidl/Samba4/Header.pm
View File

@ -390,7 +390,6 @@ sub Parse($)
pidl "/* header auto-generated by pidl */\n\n";
if (!is_intree()) {
pidl "#include <util/data_blob.h>\n";
pidl "#include <gen_ndr/misc.h>\n";
}
pidl "#include <stdint.h>\n";
pidl "\n";

2
tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
View File

@ -2597,7 +2597,7 @@ sub GenerateIncludes($)
# Samba3 has everything in include/includes.h
if (is_intree() != 3) {
$self->pidl(choose_header("libcli/util/nterr.h", "core/nterr.h"));
$self->pidl(choose_header("libcli/util/ntstatus.h", "core/ntstatus.h"));
$self->pidl(choose_header("librpc/gen_ndr/ndr_misc.h", "gen_ndr/ndr_misc.h"));
}
}