Don't define the "min" and "max" macros in the general "typedefs.h", they conflict...

Instead just define them in widl, this is currently the only place where we need them.

svn path=/trunk/; revision=30843

diff --git a/reactos/include/host/typedefs.h b/reactos/include/host/typedefs.h
index 5bc8ec4..04b75a8 100644 (file)
--- 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 f361f03..d7bea8b 100644 (file)
--- 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 <stdarg.h>
 #include "guiddef.h"
 #include "wine/rpcfc.h"