diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:48:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:48:20 +0000 |
| commit | 58046318a16d00742830bb5d4aa08593ca7d65be (patch) | |
| tree | af8fd987f8b0106799b16ceeb1eacb823bd79542 /sal | |
| parent | 7bc884185231b381cec3423822eceda1da0c9011 (diff) | |
INTEGRATION: CWS mingwport06 (1.17.178); FILE MERGED
2007/08/24 13:06:53 vg 1.17.178.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/rtl/source/alloc.c b/sal/rtl/source/alloc.c index f08eb2bcfe16..dacc0c33e364 100644 --- a/sal/rtl/source/alloc.c +++ b/sal/rtl/source/alloc.c @@ -4,9 +4,9 @@ * * $RCSfile: alloc.c,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:28:13 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:48:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,7 +152,9 @@ static void* __rtl_memory_vmalloc (sal_Size n) #ifdef SAL_W32 #define WIN32_LEAN_AND_MEAN +#ifdef _MSC_VER #pragma warning(push,1) /* disable warnings within system headers */ +#endif #include <windows.h> #include <wchar.h> |