diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:48:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:48:04 +0000 |
| commit | 7bc884185231b381cec3423822eceda1da0c9011 (patch) | |
| tree | 38551a1d3b9e2f11df818a1f4887040f2c67318f /sal/osl/w32/procimpl.cxx | |
| parent | 5f970f02458691d54bbea1f161eb13b1f501f0dc (diff) | |
INTEGRATION: CWS mingwport06 (1.7.62); FILE MERGED
2007/08/24 13:06:53 vg 1.7.62.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/osl/w32/procimpl.cxx')
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 4f832c2fd95e..e5bafad7cce9 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: procimpl.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:23:21 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:48:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,9 +41,13 @@ #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN +# ifdef _MSC_VER # pragma warning(push,1) /* disable warnings within system headers */ +# endif # include <windows.h> +# ifdef _MSC_VER # pragma warning(pop) +# endif # include <tchar.h> # undef WIN32_LEAN_AND_MEAN #endif |