From dba56805a0bbd92c10c134405ff2893b1dc412f3 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Wed, 28 Nov 2007 22:01:17 +0000 Subject: [PATCH] Don't define the "min" and "max" macros in the general "typedefs.h", they conflict with the similar functions in the "std" namespace in C++ apps then. Instead just define them in widl, this is currently the only place where we need them. svn path=/trunk/; revision=30843 --- reactos/include/host/typedefs.h | 3 --- reactos/tools/widl/widltypes.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/include/host/typedefs.h b/reactos/include/host/typedefs.h index 5bc8ec41807..04b75a80317 100644 --- a/reactos/include/host/typedefs.h +++ b/reactos/include/host/typedefs.h @@ -227,9 +227,6 @@ RemoveTailList( typedef const UNICODE_STRING *PCUNICODE_STRING; /* Widely used macros */ -#define min(a, b) ((a) < (b) ? (a) : (b)) -#define max(a,b) ((a) < (b) ? (b) : (a)) - #define LOBYTE(w) ((BYTE)(w)) #define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) #define LOWORD(l) ((WORD)((DWORD_PTR)(l))) diff --git a/reactos/tools/widl/widltypes.h b/reactos/tools/widl/widltypes.h index f361f03ed79..d7bea8b291e 100644 --- a/reactos/tools/widl/widltypes.h +++ b/reactos/tools/widl/widltypes.h @@ -27,6 +27,9 @@ #define E_OUTOFMEMORY ((HRESULT)0x8007000EL) #define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) < (b) ? (b) : (a)) + #include #include "guiddef.h" #include "wine/rpcfc.h"