diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-20 21:35:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-20 21:35:10 +0200 |
| commit | d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1 (patch) | |
| tree | cbf55ec9969235754fee3b1264d4e775476ead75 /source3/include | |
| parent | 2c1b1255c2dc095013863a1d99b750e8506237fa (diff) | |
| parent | bc9bbda8b390a221d7b88fd6eb1b54efc8c91c6b (diff) | |
| download | samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.gz samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.bz2 samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.zip | |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
source3/include/proto.h
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 65fac79d53..c164d285c1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -716,14 +716,6 @@ enum flush_reason_enum { #include "modules/nfs4_acls.h" #include "nsswitch/libwbclient/wbclient.h" -/* generated rpc server implementation functions */ -#include "librpc/gen_ndr/srv_echo.h" -#include "librpc/gen_ndr/srv_svcctl.h" -#include "librpc/gen_ndr/srv_lsa.h" -#include "librpc/gen_ndr/srv_eventlog.h" -#include "librpc/gen_ndr/srv_winreg.h" -#include "librpc/gen_ndr/srv_initshutdown.h" - /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" |