[ros-diffs] [sedwards] 17560: Add constants for DBG_CONTROL_C and DBG_CONTROL_BREAK to ntstatus.h, Work around conflict including ntstatus.h with the NDK

Add constants for DBG_CONTROL_C and DBG_CONTROL_BREAK to ntstatus.h,
Work around conflict including ntstatus.h with the NDK
Modified: trunk/reactos/include/ndk/umtypes.h
Modified: trunk/reactos/w32api/include/ntstatus.h
  _____  

Modified: trunk/reactos/include/ndk/umtypes.h
--- trunk/reactos/include/ndk/umtypes.h	2005-08-26 13:47:56 UTC (rev
17559)
+++ trunk/reactos/include/ndk/umtypes.h	2005-08-26 18:39:20 UTC (rev
17560)
@@ -13,8 +13,54 @@

 
 /* DEPENDENCIES
**************************************************************/
 #include <winioctl.h>
+#include <ntnls.h>
+
+/* Undef the following to avoid conflects including ntstatus.h with
winnt.h */
+#undef STATUS_WAIT_0
+#undef STATUS_ABANDONED_WAIT_0
+#undef STATUS_USER_APC
+#undef STATUS_TIMEOUT
+#undef STATUS_PENDING
+#undef DBG_EXCEPTION_HANDLED
+#undef DBG_CONTINUE
+#undef STATUS_SEGMENT_NOTIFICATION
+#undef DBG_TERMINATE_THREAD
+#undef DBG_TERMINATE_PROCESS
+#undef DBG_CONTROL_C
+#undef DBG_CONTROL_BREAK
+#undef DBG_COMMAND_EXCEPTION
+#undef STATUS_GUARD_PAGE_VIOLATION
+#undef STATUS_DATATYPE_MISALIGNMENT
+#undef STATUS_BREAKPOINT
+#undef STATUS_SINGLE_STEP
+#undef DBG_EXCEPTION_NOT_HANDLED
+#undef STATUS_ACCESS_VIOLATION
+#undef STATUS_IN_PAGE_ERROR
+#undef STATUS_INVALID_HANDLE
+#undef STATUS_NO_MEMORY
+#undef STATUS_ILLEGAL_INSTRUCTION
+#undef STATUS_NONCONTINUABLE_EXCEPTION
+#undef STATUS_INVALID_DISPOSITION
+#undef STATUS_ARRAY_BOUNDS_EXCEEDED
+#undef STATUS_FLOAT_DENORMAL_OPERAND
+#undef STATUS_FLOAT_DIVIDE_BY_ZERO
+#undef STATUS_FLOAT_INEXACT_RESULT
+#undef STATUS_FLOAT_INVALID_OPERATION
+#undef STATUS_FLOAT_OVERFLOW
+#undef STATUS_FLOAT_STACK_CHECK
+#undef STATUS_FLOAT_UNDERFLOW
+#undef STATUS_INTEGER_DIVIDE_BY_ZERO
+#undef STATUS_INTEGER_OVERFLOW
+#undef STATUS_PRIVILEGED_INSTRUCTION
+#undef STATUS_STACK_OVERFLOW
+#undef STATUS_CONTROL_C_EXIT
+#undef STATUS_FLOAT_MULTIPLE_FAULTS
+#undef STATUS_FLOAT_MULTIPLE_TRAPS
+#undef STATUS_REG_NAT_CONSUMPTION
+#undef STATUS_SXS_EARLY_DEACTIVATION
+#undef STATUS_SXS_INVALID_DEACTIVATION
+
 #include <ntstatus.h>
-#include <ntnls.h>
 #define STATIC static
 
 /* CONSTANTS
*****************************************************************/
  _____  

Modified: trunk/reactos/w32api/include/ntstatus.h
--- trunk/reactos/w32api/include/ntstatus.h	2005-08-26 13:47:56 UTC
(rev 17559)
+++ trunk/reactos/w32api/include/ntstatus.h	2005-08-26 18:39:20 UTC
(rev 17560)
@@ -22,6 +22,11 @@

 #define __WINE_NTSTATUS_H
 
 #ifndef WIN32_NO_STATUS
+/*
+ * Debug codes
+ */
+#define DBG_CONTROL_C                    ((NTSTATUS)0x40010005L)
+#define DBG_CONTROL_BREAK                ((NTSTATUS)0x40010008L)
 
 /*
  * Exception codes