[ros-diffs] [ekohl] 56786: [SAMLIB][SAMSRV] Prevent multiple declarations of SAM types.

Author: ekohl
Date: Sat Jun 23 10:29:20 2012
New Revision: 56786

URL: http://svn.reactos.org/svn/reactos?rev=56786&view=rev
Log:
[SAMLIB][SAMSRV]
Prevent multiple declarations of SAM types.

Modified:
    trunk/reactos/include/reactos/idl/sam.idl

Modified: trunk/reactos/include/reactos/idl/sam.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id…
==============================================================================
--- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sat Jun 23 10:29:20 2012
@@ -396,10 +396,11 @@
     [case(GroupReplicationInformation)] SAMPR_GROUP_GENERAL_INFORMATION DoNotUse;
 } SAMPR_GROUP_INFO_BUFFER, *PSAMPR_GROUP_INFO_BUFFER;
 
+cpp_quote("#ifndef _NTSAM_")
 typedef struct _SAMPR_ALIAS_GENERAL_INFORMATION
 {
     RPC_UNICODE_STRING Name;
-    unsigned long MemberCount;
+    ULONG MemberCount;
     RPC_UNICODE_STRING AdminComment;
 } SAMPR_ALIAS_GENERAL_INFORMATION, *PSAMPR_ALIAS_GENERAL_INFORMATION;
 
@@ -419,6 +420,7 @@
     AliasNameInformation,
     AliasAdminCommentInformation,
 } ALIAS_INFORMATION_CLASS;
+cpp_quote("#endif")
 
 typedef [switch_type(ALIAS_INFORMATION_CLASS)] union _SAMPR_ALIAS_INFO_BUFFER
 {