[Libreoffice-commits] core.git: desktop/source

Stephan Bergmann sbergman at redhat.com
Wed May 25 06:29:18 UTC 2016


 desktop/source/app/sofficemain.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 8d96f4b663b54b199c93dbb8aa496e77e342170e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 25 08:28:45 2016 +0200

    Silence clang-cl -Werror,-Wmicrosoft-enum-value in external include
    
    Change-Id: Ied864f8fde22a83ed35b5ce51054f055e84bac78

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index fdc60d0..66c79ca 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -50,7 +50,14 @@
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 #include <client/linux/handler/exception_handler.h>
 #elif defined WNT
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmicrosoft-enum-value"
+#endif
 #include <client/windows/handler/exception_handler.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 #include <locale>
 #include <codecvt>
 #endif


More information about the Libreoffice-commits mailing list