Kaydet (Commit) 7828f437 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

MSC needs those min/max macros after all

...otherwise, it will fail with "c:\program files\microsoft
sdks\windows\v7.1\include\GdiplusTypes.h(470) : error C3861: 'min': identifier
not found" errors.

Change-Id: Ib81ab7f5357b1f980202b63b144296fa252b71b1
üst ffcdefe8
...@@ -26,6 +26,15 @@ ...@@ -26,6 +26,15 @@
#include <win/saldata.hxx> #include <win/saldata.hxx>
#include <win/salgdi.h> #include <win/salgdi.h>
#if defined _MSC_VER
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#endif
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push, 1) #pragma warning(push, 1)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment