[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / include / includes.h

diff --git a/source/include/includes.h b/source/include/includes.h
index b084eed40cd62ffbe98b34136c14ab9eae6d6333..a57891b76311b897b4fbf52a8e088162fe1649ab 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -680,6 +680,7 @@ typedef int BOOL;
 #include "reg_objects.h"
 #include "reg_db.h"
 #include "rpc_samr.h"
+#include "rpc_srvsvc.h"
 #include "rpc_spoolss.h"
 #include "rpc_eventlog.h"
 #include "rpc_ds.h"
@@ -782,6 +783,8 @@ enum flush_reason_enum {
 #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
@@ -1262,8 +1265,4 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ;
 #include "libnscd.h"
 #endif
 
-#ifndef HAVE_SA_FAMILY_T
-typedef unsigned short int sa_family_t;
-#endif
-
 #endif /* _INCLUDES_H */