--- mstools/h/rpcdce.h	2018/08/09 18:20:33	1.1
+++ mstools/h/rpcdce.h	2018/08/09 18:21:12	1.1.1.2
@@ -81,6 +81,9 @@ typedef struct _RPC_IF_ID
 #define RPC_C_BINDING_DEFAULT_TIMEOUT 5
 #define RPC_C_BINDING_MAX_TIMEOUT 9
 
+#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234
+#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10
+
 #ifdef RPC_UNICODE_SUPPORTED
 
 typedef struct _RPC_PROTSEQ_VECTORA
@@ -112,13 +115,13 @@ typedef struct _RPC_PROTSEQ_VECTOR
 #endif /* RPC_UNICODE_SUPPORTED */
 
 typedef void
-(PAPI * RPC_OBJECT_INQ_FN) (
+RPC_OBJECT_INQ_FN (
     IN UUID PAPI * ObjectUuid,
     OUT UUID PAPI * TypeUuid,
     OUT RPC_STATUS PAPI * Status
     );
 
-typedef void PAPI * RPC_MGR_EPV; /* ### Hacked. */
+#define RPC_MGR_EPV void
 
 typedef struct
 {
@@ -446,7 +449,7 @@ RpcObjectInqType (
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcObjectSetInqFn (
-    IN RPC_OBJECT_INQ_FN InquiryFn
+    IN RPC_OBJECT_INQ_FN PAPI * InquiryFn
     );
 
 /* server */
@@ -496,14 +499,15 @@ RPC_STATUS RPC_ENTRY
 RpcServerInqIf (
     IN RPC_IF_HANDLE IfSpec,
     IN UUID PAPI * MgrTypeUuid, OPTIONAL
-    OUT RPC_MGR_EPV PAPI * MgrEpv
+    OUT RPC_MGR_EPV PAPI * PAPI * MgrEpv
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerListen (
     IN unsigned int MinimumCallThreads,
-    IN unsigned int MaxCalls
+    IN unsigned int MaxCalls,
+    IN unsigned int DontWait
     );
 
 /* server */
@@ -511,7 +515,7 @@ RPC_STATUS RPC_ENTRY
 RpcServerRegisterIf (
     IN RPC_IF_HANDLE IfSpec,
     IN UUID PAPI * MgrTypeUuid OPTIONAL,
-    IN RPC_MGR_EPV MgrEpv OPTIONAL
+    IN RPC_MGR_EPV PAPI * MgrEpv OPTIONAL
     );
 
 /* server */
@@ -675,6 +679,12 @@ RpcMgmtStopServerListening (
 
 /* server */
 RPC_STATUS RPC_ENTRY
+RpcMgmtWaitServerListen (
+    void
+    );
+
+/* server */
+RPC_STATUS RPC_ENTRY
 RpcMgmtSetServerStackSize (
     IN unsigned long ThreadStackSize
     );
@@ -1048,11 +1058,6 @@ RpcEpUnregister(
     IN UUID_VECTOR * UuidVector
     );
 
-/*
-BUGBUG : We need to include rpcdcep.h until the compiler is fixed so
-that it generates clean header files.
-*/
-
 #include "rpcdcep.h"
 
 #endif /* __RPCDCE_H__ */