diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-06 06:40:45 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-06 19:51:38 +0200 |
| commit | 919697f91298ced168c1d6baac7e0d6db3100db6 (patch) | |
| tree | f21422dd2dc76d076ff71ac76cbffe27fe038efb /extensions | |
| parent | fix subtle flex problems on MacOS (diff) | |
| download | core-919697f91298ced168c1d6baac7e0d6db3100db6.tar.gz core-919697f91298ced168c1d6baac7e0d6db3100db6.zip | |
WaE: unknown pragma
Change-Id: Id1c36d09bb2d701474e5161e12be4bf599d8efd5
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/nsp_windows.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/so_main.cxx | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index 33c282f3991d..c4065b6b6e95 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -47,8 +47,10 @@ #define _WINDOWS +#ifdef _MSC_VER #pragma warning (push,1) #pragma warning (disable:4668) +#endif #include <windows.h> #include <direct.h> @@ -57,7 +59,9 @@ #include <sys/types.h> #include <fcntl.h> +#ifdef _MSC_VER #pragma warning (pop) +#endif #endif //end of WNT diff --git a/extensions/source/nsplugin/source/nsp_windows.cxx b/extensions/source/nsplugin/source/nsp_windows.cxx index f6e7d2f6e754..e143a693d871 100644 --- a/extensions/source/nsplugin/source/nsp_windows.cxx +++ b/extensions/source/nsplugin/source/nsp_windows.cxx @@ -28,11 +28,15 @@ #ifdef WNT +#ifdef _MSC_VER #pragma warning (push,1) #pragma warning (disable:4668) +#endif #include <windows.h> +#ifdef _MSC_VER #pragma warning (pop) #endif +#endif int NSP_ResetWinStyl(long hParent) { diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 92faaa2e1481..b196a3338ea1 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -42,9 +42,11 @@ #ifdef WNT #define _WINDOWS +#ifdef _MSC_VER #pragma warning (push,1) #pragma warning (disable:4668) #pragma warning (disable:4917) +#endif #include <windows.h> #include <direct.h> @@ -54,7 +56,9 @@ // For vsnprintf() #define NSP_vsnprintf _vsnprintf +#ifdef _MSC_VER #pragma warning (pop) +#endif #endif // End WNT #include <sys/stat.h> diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index 6bf83d972543..941bf8f15b0a 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -37,16 +37,18 @@ #ifdef WNT #ifdef _MSC_VER #pragma once -#endif #pragma warning (push,1) #pragma warning (disable:4668) +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <winsock2.h> #include <malloc.h> #include <memory.h> #include <tchar.h> +#ifdef _MSC_VER #pragma warning (pop) +#endif #endif //end of WNT #include <unistd.h> |