From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sun, 6 Jan 2013 23:50:52 +0000 (+0000)
Subject: [REACTOS]
X-Git-Tag: backups/ros-csrss@60644~85^2~14
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=861e9a0a55bb5ee01f19121bb902651db1ccd499

[REACTOS]
I hope this solution will work *sigh*

svn path=/trunk/; revision=58137
---

diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h
index a8923711c21..c08b7dfc2f7 100644
--- a/reactos/include/reactos/debug.h
+++ b/reactos/include/reactos/debug.h
@@ -51,16 +51,18 @@ RtlAssert(
     PCHAR Message
 );
 
-#ifndef _NTDEF_ /* Guard against redefinition from ntdef.h */
-    #define __BCRYPT_H__ /* Hack for NDK - umtypes.h */
-    typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS;
-#endif
+/*
+ * This is the definition of NTSTATUS, but renamed
+ * in order not to conflict with other ones.
+ */
+typedef _Return_type_success_(return >= 0) LONG DEBUG_NTSTATUS;
+
 __analysis_noreturn
 NTSYSAPI
 VOID
 NTAPI
 RtlRaiseStatus(
-    _In_ NTSTATUS Status
+    _In_ DEBUG_NTSTATUS Status
 );
 
 #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */