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
This commit is contained in:
parent
795fd7a20f
commit
385d984792
2 changed files with 12 additions and 6 deletions
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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 );
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue