From 4f2b8fba2153eb5e1cd11c2af91dd57d3b5d5f63 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Wed, 19 Oct 2005 21:10:17 +0000 Subject: [PATCH] Fix the head so it compiles again. do not define same DBG_** twice. svn path=/trunk/; revision=18606 --- reactos/w32api/include/ntstatus.h | 5 ++++- reactos/w32api/include/winnt.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/w32api/include/ntstatus.h b/reactos/w32api/include/ntstatus.h index c04a6ec1b53..fbba0d23801 100644 --- a/reactos/w32api/include/ntstatus.h +++ b/reactos/w32api/include/ntstatus.h @@ -25,9 +25,12 @@ /* * Debug codes */ -#define DBG_CONTROL_C ((NTSTATUS)0x40010005L) #define DBG_PRINTEXCEPTION_C ((NTSTATUS)0x40010006L) + +#ifndef _WINNT_H +#define DBG_CONTROL_C ((NTSTATUS)0x40010005L) #define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008L) +#endif /* * Exception codes diff --git a/reactos/w32api/include/winnt.h b/reactos/w32api/include/winnt.h index 11f067c6861..419eed717d3 100644 --- a/reactos/w32api/include/winnt.h +++ b/reactos/w32api/include/winnt.h @@ -1255,8 +1255,10 @@ typedef enum #define DBG_TERMINATE_THREAD 0x40010003 #define DBG_TERMINATE_PROCESS 0x40010004 #ifndef WIN32_NO_STATUS +#ifndef __WINE_NTSTATUS_H #define DBG_CONTROL_C 0x40010005 #define DBG_CONTROL_BREAK 0x40010008 +#endif #define DBG_EXCEPTION_NOT_HANDLED 0x80010001 #endif #define TAPE_ABSOLUTE_POSITION 0