[Libreoffice-commits] .: 4 commits - canvas/inc canvas/source vcl/inc vcl/Library_vcl.mk vcl/source

[Tor Lillqvist]

 canvas/inc/canvas/canvastools.hxx         |    3 +++
 canvas/source/cairo/cairo_win32_cairo.hxx |    2 ++
 vcl/Library_vcl.mk                        |    5 +++++
 vcl/inc/vcl/keycodes.hxx                  |    1 +
 vcl/source/components/rasterizer_rsvg.cxx |    2 +-
 5 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 8e3b5e5da9f862b37a9e0fc422b0cdb1c73e6eb5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 30 19:57:07 2011 +0300

    Fixes to make it compile on Windows

diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index adf8164..5ddbfcb 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 2ececf3..e998129 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 f4c9ac4..beed31e 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>
 
commit 1f054f0e69d84b2a1af26b670ea5f02aca6df10b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 30 18:02:14 2011 +0300

    Link with the "version" library on Windows

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bea3f65..d663d46 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -442,6 +442,7 @@ endif
 else
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     graphite2_off \
+    version \
 ))
 endif
 endif
commit c75bd3c4766f23fdfe2e94336cb0a27dcb6b23dc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 30 13:00:31 2011 +0300

    Match the less clash-prone gobject DLL name we now produce

diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
index 5547b17..1e0d23f 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -48,7 +48,7 @@
     #define VCL_RSVG_CAIRO_LIBNAME      "libcairo.so"
     #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2.so"
 #elif defined WNT
-    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0-0.dll"
+    #define VCL_RSVG_GOBJECT_LIBNAME    "gobject-2.0.dll"
     #define VCL_RSVG_CAIRO_LIBNAME      "cairo.dll"
     #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2-2.dll"
 #else
commit a04158b5299e0883a73885352168f686dc9c92fd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 29 18:42:15 2011 +0300

    Link with graphite2_off on Windows, too

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 06bd0d7..bea3f65 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -439,6 +439,10 @@ $(eval $(call gb_Library_add_linked_static_libs,vcl,\
     graphite2_off \
 ))
 endif
+else
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    graphite2_off \
+))
 endif
 endif