diff options
| -rw-r--r-- | canvas/inc/canvas/canvastools.hxx | 3 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_win32_cairo.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/keycodes.hxx | 1 |
3 files changed, 6 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 { diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx index 9b4fc0893b34..2c6fa38bd49b 100644 --- a/vcl/inc/vcl/keycodes.hxx +++ b/vcl/inc/vcl/keycodes.hxx @@ -30,6 +30,7 @@ #define _SV_KEYCODES_HXX #include <vcl/sv.h> +#undef DELETE #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> |