diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-30 19:57:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-30 19:57:45 +0300 |
| commit | 05c950fe291ce5570c113fe010e0f4fa35206027 (patch) | |
| tree | 8ec6e34d4b38cc8b7fdc07b81b545b6779d7ff1d /canvas | |
| parent | 00f5e8f62362a2db094e5a954ec095a63c47246a (diff) | |
Fixes to make it compile on Windows
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/inc/canvas/canvastools.hxx | 3 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_win32_cairo.hxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 30cb614e1a62..b55bccb8138b 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -475,6 +475,9 @@ namespace canvas typedef ::std::numeric_limits< Source > SourceLimits; typedef ::std::numeric_limits< Target > TargetLimits; +#undef min +#undef max + if( ( arg<0 && !TargetLimits::is_signed) || // loosing the sign here ( SourceLimits::is_signed && arg<TargetLimits::min()) || // underflow will happen ( arg>TargetLimits::max() ) ) // overflow will happen diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx index de19aa783396..337dbc5025de 100644 --- a/canvas/source/cairo/cairo_win32_cairo.hxx +++ b/canvas/source/cairo/cairo_win32_cairo.hxx @@ -30,6 +30,8 @@ #define _CAIROCANVAS_WIN32_CAIRO_HXX #include "cairo_cairo.hxx" +#include <prewin.h> +#include <postwin.h> namespace cairo { |