summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-17 10:56:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-17 11:51:13 +0200
commita394a6f9120b0aa7b6879fe19d73474e25a21af2 (patch)
treebb190ee03a7e990f765ec77f27984b81c56d519b /extensions
parent52ede08a659588534b4aaa2272957ef3317564ff (diff)
-Werror=unknown-pragmas (MinGW, extensions)
Change-Id: I3eeb8864ddf931361f6504c04b8bfa787115cfd1
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/plugin/inc/plugin/win/sysplug.hxx8
-rw-r--r--extensions/source/plugin/win/sysplug.cxx4
-rw-r--r--extensions/source/plugin/win/winmgr.cxx4
3 files changed, 16 insertions, 0 deletions
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 0bc91bcb6174..8f4823b35739 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -29,17 +29,25 @@
#ifndef __PLUGIN_INC_WINPLUG_HXX
#define __PLUGIN_INC_WINPLUG_HXX
+#if defined _MSC_VER
#pragma warning (push,1)
#pragma warning (disable:4005)
+#endif
#include <tchar.h>
+#if defined _MSC_VER
#pragma pack( push, 8 )
+#endif
#include "npapi.h"
#include <npsdk/npupp.h>
+#if defined _MSC_VER
#pragma pack( pop )
+#endif
+#if defined _MSC_VER
#pragma warning (pop)
+#endif
#include <list>
#include <map>
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 41c1539a986d..b75eafa63a84 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -33,14 +33,18 @@
#include <plugin/impl.hxx>
+#if defined _MSC_VER
#pragma warning (push,1)
#pragma warning (disable:4005)
+#endif
#include <string.h>
#include <tchar.h>
#include <objbase.h>
+#if defined _MSC_VER
#pragma warning (pop)
+#endif
#include <list>
#include <map>
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 237ce4309880..b6b6951e1a06 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -41,14 +41,18 @@
#include "plugin/impl.hxx"
+#if defined _MSC_VER
#pragma warning (push,1)
#pragma warning (disable:4005)
+#endif
#include <string.h>
#include <tchar.h>
#include <objbase.h>
+#if defined _MSC_VER
#pragma warning (pop)
+#endif
#include <list>
#include <map>