[PATCH 6/8] Also use .NET2003 build fix for Clang

Kristian Rietveld kris at lanedo.com
Sat Oct 22 01:10:28 PDT 2011


---
 toolkit/source/awt/forward.hxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx
index ab39b40..efb22e7 100644
--- a/toolkit/source/awt/forward.hxx
+++ b/toolkit/source/awt/forward.hxx
@@ -64,12 +64,12 @@
         return aReturn; \
     }
 
-#if defined (_MSC_VER) && (_MSC_VER <= 1310)
+#if (defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__)
 // Windows .Net2003 build fix
 #define W3K_EXPLICIT_CAST(x) static_cast <XWindow2*> (&x)
-#else // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
+#else // !((defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__))
 #define W3K_EXPLICIT_CAST(x) x
-#endif // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
+#endif // !((defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__))
 
 #endif /* AWT_FORWARD_HXX */
 
-- 
1.7.4.4


--------------040504020407040509000307--


More information about the LibreOffice mailing list