--- mstools/h/rpcnsi.h	2018/08/09 18:20:29	1.1.1.1
+++ mstools/h/rpcnsi.h	2018/08/09 18:23:03	1.1.1.2
@@ -1,41 +1,41 @@
 /*++
 
-Copyright (c) 1992 Microsoft Corporation
+Copyright (c) 1992-1993 Microsoft Corporation
 
 Module Name:
 
-    rocnsi.h
+    rpcnsi.h
 
 Abstract:
 
     This file contains the types and function definitions to use the
     Name Service Independent APIs.
 
-Author:
-
-    Steven Zeck (stevez) 03/09/92
-
 --*/
 
 #ifndef __RPCNSI_H__
 #define __RPCNSI_H__
 
-typedef void PAPI * RPC_NS_HANDLE;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void __RPC_FAR * RPC_NS_HANDLE;
 
 typedef struct
 {
   unsigned long Count;
-  RPC_IF_ID PAPI * IfHandle[1];
+  RPC_IF_ID __RPC_FAR * IfId[1];
 } RPC_IF_ID_VECTOR;
 
 #define RPC_C_NS_SYNTAX_DEFAULT 0
-#define RPC_C_NS_SYNTAX_DCE 1
+#define RPC_C_NS_SYNTAX_DCE 3
 
 #define RPC_C_VERS_ALL 0
 #define RPC_C_VERS_COMPATIBLE 1
 #define RPC_C_VERS_EXACT 2
 #define RPC_C_VERS_MAJOR_ONLY 3
-#define RPC_C_VERS_VERS_UPTO 4
+#define RPC_C_VERS_UPTO 4
 
 #define RPC_C_PROFILE_DEFAULT_ELT 0
 #define RPC_C_PROFILE_ALL_ELT 1
@@ -50,19 +50,19 @@ typedef struct
 RPC_STATUS RPC_ENTRY
 RpcNsBindingExportA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
+    IN unsigned char __RPC_FAR * EntryName,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN RPC_BINDING_VECTOR PAPI * BindingVec OPTIONAL,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN RPC_BINDING_VECTOR __RPC_FAR * BindingVec OPTIONAL,
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingUnexportA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
+    IN unsigned char __RPC_FAR * EntryName,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -70,18 +70,18 @@ RpcNsBindingUnexportA(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingExportW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
+    IN unsigned short __RPC_FAR * EntryName,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN RPC_BINDING_VECTOR PAPI * BindingVec OPTIONAL,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN RPC_BINDING_VECTOR __RPC_FAR * BindingVec OPTIONAL,
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingUnexportW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
+    IN unsigned short __RPC_FAR * EntryName,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 #endif
@@ -91,11 +91,11 @@ RpcNsBindingUnexportW(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingLookupBeginA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName OPTIONAL,
+    IN unsigned char __RPC_FAR * EntryName OPTIONAL,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID PAPI * ObjUuid OPTIONAL,
+    IN UUID __RPC_FAR * ObjUuid OPTIONAL,
     IN unsigned long BindingMaxCount OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * LookupContext
+    OUT RPC_NS_HANDLE __RPC_FAR * LookupContext
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -103,23 +103,23 @@ RpcNsBindingLookupBeginA(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingLookupBeginW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName OPTIONAL,
+    IN unsigned short __RPC_FAR * EntryName OPTIONAL,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID PAPI * ObjUuid OPTIONAL,
+    IN UUID __RPC_FAR * ObjUuid OPTIONAL,
     IN unsigned long BindingMaxCount OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * LookupContext
+    OUT RPC_NS_HANDLE __RPC_FAR * LookupContext
     );
 #endif
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingLookupNext(
     IN  RPC_NS_HANDLE LookupContext,
-    OUT RPC_BINDING_VECTOR PAPI * PAPI * BindingVec
+    OUT RPC_BINDING_VECTOR __RPC_FAR * __RPC_FAR * BindingVec
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingLookupDone(
-    IN OUT RPC_NS_HANDLE PAPI * LookupContext
+    IN OUT RPC_NS_HANDLE __RPC_FAR * LookupContext
     );
 
 /* Group APIs */
@@ -127,37 +127,37 @@ RpcNsBindingLookupDone(
 RPC_STATUS RPC_ENTRY
 RpcNsGroupDeleteA(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned char PAPI * GroupName
+    IN unsigned char __RPC_FAR * GroupName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrAddA(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned char PAPI * GroupName,
+    IN unsigned char __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned char PAPI * MemberName
+    IN unsigned char __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrRemoveA(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned char PAPI * GroupName,
+    IN unsigned char __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned char PAPI * MemberName
+    IN unsigned char __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrInqBeginA(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned char PAPI * GroupName,
+    IN unsigned char __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrInqNextA(
     IN  RPC_NS_HANDLE InquiryContext,
-    OUT unsigned char PAPI * PAPI * MemberName
+    OUT unsigned char __RPC_FAR * __RPC_FAR * MemberName
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -165,44 +165,44 @@ RpcNsGroupMbrInqNextA(
 RPC_STATUS RPC_ENTRY
 RpcNsGroupDeleteW(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned short PAPI * GroupName
+    IN unsigned short __RPC_FAR * GroupName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrAddW(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned short PAPI * GroupName,
+    IN unsigned short __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned short PAPI * MemberName
+    IN unsigned short __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrRemoveW(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned short PAPI * GroupName,
+    IN unsigned short __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned short PAPI * MemberName
+    IN unsigned short __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrInqBeginW(
     IN unsigned long GroupNameSyntax OPTIONAL,
-    IN unsigned short PAPI * GroupName,
+    IN unsigned short __RPC_FAR * GroupName,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrInqNextW(
     IN  RPC_NS_HANDLE InquiryContext,
-    OUT unsigned short PAPI * PAPI * MemberName
+    OUT unsigned short __RPC_FAR * __RPC_FAR * MemberName
     );
 
 #endif
 
 RPC_STATUS RPC_ENTRY
 RpcNsGroupMbrInqDone(
-    IN OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 /* Profile APIs */
@@ -210,48 +210,48 @@ RpcNsGroupMbrInqDone(
 RPC_STATUS RPC_ENTRY
 RpcNsProfileDeleteA(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned char PAPI * ProfileName
+    IN unsigned char __RPC_FAR * ProfileName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltAddA(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned char PAPI * ProfileName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned char __RPC_FAR * ProfileName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned char PAPI * MemberName,
+    IN unsigned char __RPC_FAR * MemberName,
     IN unsigned long Priority,
-    IN unsigned char PAPI * Annotation OPTIONAL
+    IN unsigned char __RPC_FAR * Annotation OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltRemoveA(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned char PAPI * ProfileName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned char __RPC_FAR * ProfileName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned char PAPI * MemberName
+    IN unsigned char __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltInqBeginA(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned char PAPI * ProfileName,
+    IN unsigned char __RPC_FAR * ProfileName,
     IN unsigned long InquiryType,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long VersOption,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned char PAPI * MemberName OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN unsigned char __RPC_FAR * MemberName OPTIONAL,
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltInqNextA(
     IN RPC_NS_HANDLE InquiryContext,
-    OUT RPC_IF_ID PAPI * IfId,
-    OUT unsigned char PAPI * PAPI * MemberName,
-    OUT unsigned long PAPI * Priority,
-    OUT unsigned char PAPI * PAPI * Annotation
+    OUT RPC_IF_ID __RPC_FAR * IfId,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * MemberName,
+    OUT unsigned long __RPC_FAR * Priority,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * Annotation
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -259,55 +259,55 @@ RpcNsProfileEltInqNextA(
 RPC_STATUS RPC_ENTRY
 RpcNsProfileDeleteW(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned short PAPI * ProfileName
+    IN unsigned short __RPC_FAR * ProfileName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltAddW(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned short PAPI * ProfileName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned short __RPC_FAR * ProfileName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned short PAPI * MemberName,
+    IN unsigned short __RPC_FAR * MemberName,
     IN unsigned long Priority,
-    IN unsigned short PAPI * Annotation OPTIONAL
+    IN unsigned short __RPC_FAR * Annotation OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltRemoveW(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned short PAPI * ProfileName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned short __RPC_FAR * ProfileName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned short PAPI * MemberName
+    IN unsigned short __RPC_FAR * MemberName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltInqBeginW(
     IN unsigned long ProfileNameSyntax OPTIONAL,
-    IN unsigned short PAPI * ProfileName,
+    IN unsigned short __RPC_FAR * ProfileName,
     IN unsigned long InquiryType,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long VersOption,
     IN unsigned long MemberNameSyntax OPTIONAL,
-    IN unsigned short PAPI * MemberName OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN unsigned short __RPC_FAR * MemberName OPTIONAL,
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltInqNextW(
     IN RPC_NS_HANDLE InquiryContext,
-    OUT RPC_IF_ID PAPI * IfId,
-    OUT unsigned short PAPI * PAPI * MemberName,
-    OUT unsigned long PAPI * Priority,
-    OUT unsigned short PAPI * PAPI * Annotation
+    OUT RPC_IF_ID __RPC_FAR * IfId,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * MemberName,
+    OUT unsigned long __RPC_FAR * Priority,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * Annotation
     );
 
 #endif
 
 RPC_STATUS RPC_ENTRY
 RpcNsProfileEltInqDone(
-    IN OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 /* Entry object APIs */
@@ -315,8 +315,8 @@ RpcNsProfileEltInqDone(
 RPC_STATUS RPC_ENTRY
 RpcNsEntryObjectInqBeginA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN unsigned char __RPC_FAR * EntryName,
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -324,8 +324,8 @@ RpcNsEntryObjectInqBeginA(
 RPC_STATUS RPC_ENTRY
 RpcNsEntryObjectInqBeginW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
-    OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN unsigned short __RPC_FAR * EntryName,
+    OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 #endif
@@ -333,12 +333,12 @@ RpcNsEntryObjectInqBeginW(
 RPC_STATUS RPC_ENTRY
 RpcNsEntryObjectInqNext(
     IN  RPC_NS_HANDLE InquiryContext,
-    OUT UUID PAPI * ObjUuid
+    OUT UUID __RPC_FAR * ObjUuid
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsEntryObjectInqDone(
-    IN OUT RPC_NS_HANDLE PAPI * InquiryContext
+    IN OUT RPC_NS_HANDLE __RPC_FAR * InquiryContext
     );
 
 /* Management and MISC APIs */
@@ -346,41 +346,41 @@ RpcNsEntryObjectInqDone(
 RPC_STATUS RPC_ENTRY
 RpcNsEntryExpandNameA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
-    OUT unsigned char PAPI * PAPI * ExpandedName
+    IN unsigned char __RPC_FAR * EntryName,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ExpandedName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtBindingUnexportA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned char __RPC_FAR * EntryName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long VersOption,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryCreateA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName
+    IN unsigned char __RPC_FAR * EntryName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryDeleteA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName
+    IN unsigned char __RPC_FAR * EntryName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryInqIfIdsA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName,
-    OUT RPC_IF_ID_VECTOR PAPI * PAPI * IfIdVec
+    IN unsigned char __RPC_FAR * EntryName,
+    OUT RPC_IF_ID_VECTOR __RPC_FAR * __RPC_FAR * IfIdVec
     );
 
 RPC_STATUS RPC_ENTRY
 RpcIfIdVectorFree (
-    IN OUT RPC_IF_ID_VECTOR PAPI * PAPI * IfIdVec
+    IN OUT RPC_IF_ID_VECTOR __RPC_FAR * __RPC_FAR * IfIdVec
     );
 
 RPC_STATUS RPC_ENTRY
@@ -391,7 +391,7 @@ RpcNsMgmtHandleSetExpAge(
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtInqExpAge(
-    OUT unsigned long PAPI * ExpirationAge
+    OUT unsigned long __RPC_FAR * ExpirationAge
     );
 
 RPC_STATUS RPC_ENTRY
@@ -404,36 +404,36 @@ RpcNsMgmtSetExpAge(
 RPC_STATUS RPC_ENTRY
 RpcNsEntryExpandNameW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
-    OUT unsigned short PAPI * PAPI * ExpandedName
+    IN unsigned short __RPC_FAR * EntryName,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * ExpandedName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtBindingUnexportW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
-    IN RPC_IF_ID PAPI * IfId OPTIONAL,
+    IN unsigned short __RPC_FAR * EntryName,
+    IN RPC_IF_ID __RPC_FAR * IfId OPTIONAL,
     IN unsigned long VersOption,
-    IN UUID_VECTOR PAPI * ObjectUuidVec OPTIONAL
+    IN UUID_VECTOR __RPC_FAR * ObjectUuidVec OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryCreateW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName
+    IN unsigned short __RPC_FAR * EntryName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryDeleteW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName
+    IN unsigned short __RPC_FAR * EntryName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsMgmtEntryInqIfIdsW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName,
-    OUT RPC_IF_ID_VECTOR PAPI * PAPI * IfIdVec
+    IN unsigned short __RPC_FAR * EntryName,
+    OUT RPC_IF_ID_VECTOR __RPC_FAR * __RPC_FAR * IfIdVec
     );
 
 #endif
@@ -443,10 +443,10 @@ RpcNsMgmtEntryInqIfIdsW(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingImportBeginA(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned char PAPI * EntryName OPTIONAL,
+    IN unsigned char __RPC_FAR * EntryName OPTIONAL,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID PAPI * ObjUuid OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * ImportContext
+    IN UUID __RPC_FAR * ObjUuid OPTIONAL,
+    OUT RPC_NS_HANDLE __RPC_FAR * ImportContext
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -454,10 +454,10 @@ RpcNsBindingImportBeginA(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingImportBeginW(
     IN unsigned long EntryNameSyntax OPTIONAL,
-    IN unsigned short PAPI * EntryName OPTIONAL,
+    IN unsigned short __RPC_FAR * EntryName OPTIONAL,
     IN RPC_IF_HANDLE IfSpec OPTIONAL,
-    IN UUID PAPI * ObjUuid OPTIONAL,
-    OUT RPC_NS_HANDLE PAPI * ImportContext
+    IN UUID __RPC_FAR * ObjUuid OPTIONAL,
+    OUT RPC_NS_HANDLE __RPC_FAR * ImportContext
     );
 
 #endif
@@ -465,18 +465,18 @@ RpcNsBindingImportBeginW(
 RPC_STATUS RPC_ENTRY
 RpcNsBindingImportNext(
     IN RPC_NS_HANDLE ImportContext,
-    OUT RPC_BINDING_HANDLE  PAPI * Binding
+    OUT RPC_BINDING_HANDLE  __RPC_FAR * Binding
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingImportDone(
-    IN OUT RPC_NS_HANDLE PAPI * ImportContext
+    IN OUT RPC_NS_HANDLE __RPC_FAR * ImportContext
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingSelect(
-    IN OUT RPC_BINDING_VECTOR PAPI * BindingVec,
-    OUT RPC_BINDING_HANDLE  PAPI * Binding
+    IN OUT RPC_BINDING_VECTOR __RPC_FAR * BindingVec,
+    OUT RPC_BINDING_HANDLE  __RPC_FAR * Binding
     );
 
 #ifdef UNICODE
@@ -527,23 +527,8 @@ RpcNsBindingSelect(
 
 #endif /* UNICODE */
 
-#define RPC_S_NOTHING_TO_EXPORT       RPC_S_NO_INTERFACES_EXPORTED /* add */
-#define RPC_S_NO_MORE_BINDINGS        RPC_S_NO_BINDINGS            /* add */
-#define RPC_S_NOT_ALL_OBJS_UNEXPORTED RPC_S_NOTHING_TO_UNEXPORT    /* add */
-
-#define RpcCNsSyntaxDefault 0
-#define RpcCNsSyntaxDce 1
-
-#define RpcCVersAll 0
-#define RpcCVersCompatible 1
-#define RpcCVersExact 2
-#define RpcCVersMajorOnly 3
-#define RpcCVersVersUpto 4
-
-#define RpcCProfileDefaultElt 0
-#define RpcCProfileAllElt 1
-#define RpcCProfileMatchByIf 2
-#define RpcCProfileMatchByMbr 3
-#define RpcCProfileMatchByBoth 4
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __RPCNSI_H__ */