diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:15:01 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:15:01 +0000 |
commit | e3221c439afe94203e4872d3822be4098b73489b (patch) | |
tree | b295b71922a3003488e99d3b6cdcbca260edf583 /tools | |
parent | 4e1ca5a2ad0e7431270751ff0cfa8722257be56e (diff) |
INTEGRATION: CWS mingwport06 (1.8.24); FILE MERGED
2007/08/24 13:27:29 vg 1.8.24.1: #i75499# pragma is for MSVC
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/fsys/wntmsc.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 2438ccbf7535..b005ad0bb8f3 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wntmsc.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:12:26 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:15:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,11 +36,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" +#ifdef _MSC_VER #pragma warning (push,1) +#endif #include <stdio.h> #include <ctype.h> #include <limits.h> +#ifdef _MSC_VER #pragma warning (pop) +#endif #include "wntmsc.hxx" #include <tools/errinf.hxx> @@ -612,10 +616,14 @@ FileStat::FileStat( const void *pInfo, // struct dirent |* *************************************************************************/ +#ifdef _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) +#endif #include <shlobj.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #ifdef UNICODE #define lstrchr wcschr |