diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:15:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:15:11 +0000 |
| commit | 385d98479202bc754b11b3a225acbcbdc878e5bc (patch) | |
| tree | bd5f0cd3f6893042b8db4e94b719ade2643e0c6a /sal/systools | |
| parent | 795fd7a20fe395d703eb1f0f6df7bf9bf3fa6405 (diff) | |
INTEGRATION: CWS obo05 (1.4.112); FILE MERGED
2006/06/28 10:29:31 obo 1.4.112.1: #i53711# .net 2005 signed/unsigned warnings
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/CommandLineToArgvW.cpp | 9 | ||||
| -rw-r--r-- | sal/systools/win32/uwinapi/CopyFileExW.cpp | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp index b43332d1ea6f..7c5a9cb05b4d 100644 --- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp +++ b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp @@ -4,9 +4,9 @@ * * $RCSfile: CommandLineToArgvW.cpp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:10:11 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:14:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,6 +32,9 @@ * MA 02111-1307 USA * ************************************************************************/ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable:4740) +#endif #include "macros.h" @@ -174,4 +177,4 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS } return lpArgvW; -} +}
\ No newline at end of file diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/sal/systools/win32/uwinapi/CopyFileExW.cpp index 1c92dba956eb..82e62e98cf20 100644 --- a/sal/systools/win32/uwinapi/CopyFileExW.cpp +++ b/sal/systools/win32/uwinapi/CopyFileExW.cpp @@ -4,9 +4,9 @@ * * $RCSfile: CopyFileExW.cpp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:10:51 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:15:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,6 +32,9 @@ * MA 02111-1307 USA * ************************************************************************/ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable:4740) +#endif #define _WIN32_WINNT 0x0400 #include "macros.h" @@ -42,4 +45,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExW, ( LPCWSTR lpExist AUTO_WSTR2STR( lpNewFileName ); return CopyFileExA( lpExistingFileNameA, lpNewFileNameA, lpProgressRoutine, lpData, pbCancel, dwCopyFlags ); -} +}
\ No newline at end of file |