[ros-diffs] [ros-arm-bringup] 41876: WINNT.H already defines CONTEXT so avoid a double-definition if ARMDDK is included
ros-arm-bringup at svn.reactos.org
ros-arm-bringup at svn.reactos.org
Sat Jul 11 14:36:21 CEST 2009
Author: ros-arm-bringup
Date: Sat Jul 11 16:36:20 2009
New Revision: 41876
URL: http://svn.reactos.org/svn/reactos?rev=41876&view=rev
Log:
WINNT.H already defines CONTEXT so avoid a double-definition if ARMDDK is included
Modified:
trunk/reactos/include/reactos/arm/armddk.h
Modified: trunk/reactos/include/reactos/arm/armddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk.h?rev=41876&r1=41875&r2=41876&view=diff
==============================================================================
--- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sat Jul 11 16:36:20 2009
@@ -58,6 +58,7 @@
ULONG Reserved;
} KFLOATING_SAVE, *PKFLOATING_SAVE;
+#ifndef _WINNT_H
/* The following flags control the contents of the CONTEXT structure. */
#define CONTEXT_ARM 0x0000040
#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L)
@@ -104,6 +105,7 @@
ULONG Pc;
ULONG Psr;
} CONTEXT;
+#endif
//
// Processor Control Region
More information about the Ros-diffs
mailing list