From 17011105284e0eae4efc00d63dbacc3a7158d6b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 19 Jul 2013 13:03:42 +0000 Subject: [PATCH] Fix ASSERTMSG definition and usage (which is: ASSERTMSG(Message, expression) and not the other way around, see http://msdn.microsoft.com/en-us/library/windows/hardware/ff542113(v=vs.85).aspx , http://www.osronline.com/DDKx/ddtools/debugfns_41yr.htm and google...) (Part 2/X) WARNING: Might break builds now. svn path=/trunk/; revision=59509 --- reactos/include/host/typedefs.h | 2 +- reactos/include/reactos/debug.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/include/host/typedefs.h b/reactos/include/host/typedefs.h index 49de4f3235d..2b60d3de798 100644 --- a/reactos/include/host/typedefs.h +++ b/reactos/include/host/typedefs.h @@ -29,7 +29,7 @@ /* Basic definitions */ #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } #define ASSERT(x) assert(x) -#define ASSERTMSG(x, m) assert(x) +#define ASSERTMSG(m, x) assert(x) #define DPRINT if (0) printf #define DPRINT1 printf diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h index f6b38d37d5a..f467dc8377c 100644 --- a/reactos/include/reactos/debug.h +++ b/reactos/include/reactos/debug.h @@ -79,9 +79,9 @@ RtlAssert( #ifndef ASSERTMSG #ifndef NASSERT -#define ASSERTMSG(x,m) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } +#define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } #else -#define ASSERTMSG(x) +#define ASSERTMSG(m, x) #endif #endif