[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/vcl

[Richard PALO]

 include/vcl/window.hxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 31c2a2230e6debd0fa53656f6a2159918d2d67d8
Author: Richard PALO <richard at NetBSD.org>
Date:   Fri Apr 17 08:34:40 2015 +0200

    Avoid redefine of TRANSPARENT on solaris after including stream.h
    
    Change-Id: I90611a4855320148f1d4b6e61a420ada47308c28
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit e4f10cb0e12e7965df5e469cc22e6893044cabc3)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce43cd4..bc75618 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -228,6 +228,9 @@ namespace svt { class PopupWindowControllerImpl; }
 #define AUTOSCROLL_VERT                 ((sal_uInt16)0x0001)
 #define AUTOSCROLL_HORZ                 ((sal_uInt16)0x0002)
 
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#endif
 // Flags for StateChanged()
 enum class StateChangedType : sal_uInt16
 {