summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-27 16:50:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-28 14:00:04 +0100
commit77a39107b1d629022d3ba8711f7a7051e9461280 (patch)
tree454aa06c9da1b2470c41853234866934110268e6 /winaccessibility
parentf5f63b9f9869b632a89078500ba0a74d72f913e6 (diff)
Silence clang-cl -Wextra-tokens in midl-generated code
Change-Id: Ib7f83de9bd0636cff11c5e75932d2bc8fd8437fa
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/UAccCOM/UAccCOM.cxx8
-rw-r--r--winaccessibility/source/service/AccObject.cxx10
2 files changed, 17 insertions, 1 deletions
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 86d27d6491aa..4f54a37c544a 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -23,8 +23,16 @@
#include "UAccCOM.h"
#include <accHelper.hxx>
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wextra-tokens"
+ // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
+#endif
#include "UAccCOM_i.c"
#include "ia2_api_all_i.c"
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
#include "MAccessible.h"
#include "EnumVariant.h"
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index 803a55ce7839..8b60ddf412fd 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -32,9 +32,17 @@
#include "AccObject.hxx"
#include "AccEventListener.hxx"
-#include "UAccCOM_i.c"
#include "AccResource.hxx"
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wextra-tokens"
+ // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
+#endif
+#include "UAccCOM_i.c"
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
using namespace std;
using namespace com::sun::star::uno;