diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:17:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:17:12 +0000 |
| commit | 0f9e2daf836bd85bd2920250425f73108987ffd8 (patch) | |
| tree | a604a92fe17435adceb5f793b0637be081a8aea4 | |
| parent | 7951f0795db0bc687e056107570d0d90908b3363 (diff) | |
INTEGRATION: CWS obo05 (1.6.2); FILE MERGED
2006/06/28 10:29:32 obo 1.6.2.1: #i53711# .net 2005 signed/unsigned warnings
| -rw-r--r-- | sal/systools/win32/uwinapi/macros.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h index 542a4e1e3de3..9c6ae5a4e2f1 100644 --- a/sal/systools/win32/uwinapi/macros.h +++ b/sal/systools/win32/uwinapi/macros.h @@ -4,9 +4,9 @@ * * $RCSfile: macros.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:35:43 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:17:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,10 @@ # include <malloc.h> #endif +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable:4740) +#endif + #ifndef _INC_TCHAR # ifdef UNICODE # define _UNICODE @@ -94,7 +98,7 @@ LPSTR lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NUL #define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \ - MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, cchDestBuffer ) + MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, (int) cchDestBuffer ) #define STR2WSTR( lpStr, cchBuffer ) \ STRBUF2WSTR( lpStr, -1, cchBuffer ) @@ -164,5 +168,4 @@ static rettype calltype func##_##Failure params \ { \ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ return (rettype)0; \ -} - +}
\ No newline at end of file |