commit 31c2a2230e6debd0fa53656f6a2159918d2d67d8
author Richard PALO <richard@NetBSD.org> Fri Apr 17 08:34:40 2015 +0200
committer Michael Stahl <mstahl@redhat.com> Tue May 05 15:56:07 2015 +0200
tree a4ed88fed7bde03b885f70b902c25821e0d70023
parent 95e82a3e49b4df856fc72dc0bca2842057630c31

Avoid redefine of TRANSPARENT on solaris after including stream.h

Change-Id: I90611a4855320148f1d4b6e61a420ada47308c28
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e4f10cb0e12e7965df5e469cc22e6893044cabc3)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

include/vcl/window.hxx

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
{