summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx7
2 files changed, 8 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 26d79eccfcfb..a83296f95e03 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -111,6 +111,7 @@
#ifdef WNT
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
+#pragma warning (disable: 4005)
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index bd83d12e5a5e..36af07114e28 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -88,7 +88,14 @@
#ifdef WNT
#define GradientStyle_RECT BLA_GradientStyle_RECT
+#if defined _MSC_VER
+#pragma warning (push, 1)
+#pragma warning (disable: 4005)
+#endif
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
#include <objbase.h>
#undef GradientStyle_RECT
#endif