--- mstools/h/rpc.h	2018/08/09 18:20:34	1.1.1.2
+++ mstools/h/rpc.h	2018/08/09 18:23:10	1.1.1.4
@@ -1,14 +1,24 @@
-/*********************************************************/
-/**               Microsoft LAN Manager                 **/
-/**          Copyright(c) Microsoft Corp., 1991         **/
-/**                                                     **/
-/**              Base Include file for NT               **/
-/**                                                     **/
-/*********************************************************/
+/*++
+
+Copyright (c) 1991-1993 Microsoft Corporation
+
+Module Name:
+
+    rpc.h
+
+Abstract:
+
+    Master include file for RPC applications.
+
+--*/
 
 #ifndef __RPC_H__
 #define __RPC_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define __RPC_WIN32__
 
 #ifndef __MIDL_USER_DEFINED
@@ -19,9 +29,21 @@
 
 typedef void * I_RPC_HANDLE;
 typedef long RPC_STATUS;
-#define PAPI
-#define RPC_ENTRY
+
 #define RPC_UNICODE_SUPPORTED
+#if   (_MSC_VER >= 800)
+#define __RPC_FAR
+#define __RPC_API  __stdcall
+#define __RPC_USER __stdcall
+#define __RPC_STUB __stdcall
+#define RPC_ENTRY  __stdcall
+#else
+#define __RPC_FAR
+#define __RPC_API
+#define __RPC_USER
+#define __RPC_STUB
+#define RPC_ENTRY
+#endif
 
 #ifdef IN
 #undef IN
@@ -89,4 +111,9 @@ I_RpcMapWin32Status (
     IN RPC_STATUS Status
     );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // __RPC_H__
+