diff options
| author | Jeremy Allison <jra@samba.org> | 2008-10-20 16:38:25 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-10-20 16:38:25 -0700 |
| commit | 29c9b88e2bb5d3f585e7aa591870e8b39a0d23c9 (patch) | |
| tree | 761e1b6c8172470d651c7760806ce5081f5ee55f /source3/include/includes.h | |
| parent | 6aba3516769b944e7960d27f10799bb8a8898d2d (diff) | |
| parent | cefe4c66970b8ca243595cdb940a7c1a26765a08 (diff) | |
| download | samba-29c9b88e2bb5d3f585e7aa591870e8b39a0d23c9.tar.gz samba-29c9b88e2bb5d3f585e7aa591870e8b39a0d23c9.tar.bz2 samba-29c9b88e2bb5d3f585e7aa591870e8b39a0d23c9.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index ac5b2b215c..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" @@ -813,10 +805,6 @@ enum flush_reason_enum { #define SYNC_DNS 1 #endif -#ifndef HAVE_CRYPT -#define crypt ufc_crypt -#endif - #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) #define ULTRIX_AUTH 1 #endif @@ -1079,7 +1067,6 @@ ssize_t readahead(int fd, off64_t offset, size_t count); #endif #define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) -#define CONST_ADD(type, ptr) ((type) ((const void *) (ptr))) void smb_panic( const char *why ) _NORETURN_; void dump_core(void) _NORETURN_; |