[ros-diffs] [hpoussin] 22589: Don't redefine UNICODE_STRING/STRING (may happen if winternl.h is already included)

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Sat Jun 24 23:14:42 CEST 2006


Author: hpoussin
Date: Sun Jun 25 01:14:41 2006
New Revision: 22589

URL: http://svn.reactos.org/svn/reactos?rev=22589&view=rev
Log:
Don't redefine UNICODE_STRING/STRING (may happen if winternl.h is already included)

Modified:
    trunk/reactos/include/ntsecapi.h

Modified: trunk/reactos/include/ntsecapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntsecapi.h?rev=22589&r1=22588&r2=22589&view=diff
==============================================================================
--- trunk/reactos/include/ntsecapi.h (original)
+++ trunk/reactos/include/ntsecapi.h Sun Jun 25 01:14:41 2006
@@ -374,8 +374,10 @@
   LONG DomainIndex;
 } LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME;
 
-#ifndef _NTDEF_
+#if defined(_NTDEF_) && !defined(UNICODE_STRING)
 typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING;
+#endif
+#if defined(_NTDEF_) && !defined(STRING)
 typedef LSA_STRING STRING, *PSTRING ;
 #endif
 




More information about the Ros-diffs mailing list