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
This commit is contained in:
Colin Finck 2007-11-28 22:01:17 +00:00
parent 484d24fef4
commit dba56805a0
2 changed files with 3 additions and 3 deletions

View file

@ -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)))

View file

@ -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"