diff options
author | Richard PALO <richard@NetBSD.org> | 2015-04-17 08:34:40 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-05-08 15:00:30 +0200 |
commit | 9a5c49fc511282965974c734722723786251b684 (patch) | |
tree | b3f90baa7ca4031a85db6d5f938f351dc5a4de35 /include | |
parent | a981eeec6be6485deeca32c6866f8aa781680419 (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/window.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ce43cd41f1e5..bc756186a66b 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 { |