diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:47:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:47:50 +0000 |
| commit | 5f970f02458691d54bbea1f161eb13b1f501f0dc (patch) | |
| tree | 5d8702d73e5b3ed97108436e9b97482fcdda882d /sal/osl/w32 | |
| parent | 96bd1753c6781606e2cfac1b78570cac24a67eee (diff) | |
INTEGRATION: CWS mingwport06 (1.33.52); FILE MERGED
2007/08/27 13:59:42 vg 1.33.52.2: #i75499# pragma for MSVC
2007/08/24 13:06:53 vg 1.33.52.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/osl/w32')
| -rw-r--r-- | sal/osl/w32/process.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sal/osl/w32/process.c b/sal/osl/w32/process.c index ce6ff2a58067..826cd3c374e4 100644 --- a/sal/osl/w32/process.c +++ b/sal/osl/w32/process.c @@ -4,9 +4,9 @@ * * $RCSfile: process.c,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2007-05-09 13:21:53 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:47:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,9 +35,13 @@ #define UNICODE #include "system.h" +#ifdef _MSC_VER #pragma warning(push,1) /* disable warnings within system headers */ +#endif #include <shellapi.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <osl/diagnose.h> #include <osl/security.h> @@ -264,8 +268,10 @@ static struct CommandArgs_Impl g_command_args = 0 }; +#ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 4100 ) +#endif static rtl_uString ** osl_createCommandArgs_Impl (int argc, char ** argv) { rtl_uString ** ppArgs = @@ -311,7 +317,9 @@ static rtl_uString ** osl_createCommandArgs_Impl (int argc, char ** argv) return (ppArgs); } +#ifdef _MSC_VER #pragma warning( pop ) +#endif /***************************************************************************/ |