diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2015-01-27 08:36:02 +0000 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-01-27 08:36:02 +0000 |
commit | 7e23982e45ede7c6810c2b6e5435dd8f854f13cf (patch) | |
tree | efc458975a239d63f52697499ede837902b0544a /cpan | |
parent | 0563a5d0dbc2057bd72b3c885c6056f7307808d9 (diff) | |
download | perl-7e23982e45ede7c6810c2b6e5435dd8f854f13cf.tar.gz |
Merge upstream fix for C++ mode build of Win32API-File
This is so we can have C++ mode builds on Windows without having to wait
for a new CPAN release of Win32API-File.
Diffstat (limited to 'cpan')
-rw-r--r-- | cpan/Win32API-File/File.pm | 2 | ||||
-rw-r--r-- | cpan/Win32API-File/File.xs | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cpan/Win32API-File/File.pm b/cpan/Win32API-File/File.pm index 03b736eb77..bf2d531a12 100644 --- a/cpan/Win32API-File/File.pm +++ b/cpan/Win32API-File/File.pm @@ -10,7 +10,7 @@ use Fcntl qw( O_RDONLY O_RDWR O_WRONLY O_APPEND O_BINARY O_TEXT ); use vars qw( $VERSION @ISA ); use vars qw( @EXPORT @EXPORT_OK @EXPORT_FAIL %EXPORT_TAGS ); -$VERSION= '0.1201'; +$VERSION= '0.1201_01'; use base qw( Exporter DynaLoader Tie::Handle IO::File ); diff --git a/cpan/Win32API-File/File.xs b/cpan/Win32API-File/File.xs index cff488f8a6..83971d0000 100644 --- a/cpan/Win32API-File/File.xs +++ b/cpan/Win32API-File/File.xs @@ -148,7 +148,7 @@ CreateFileA( sPath, uAccess, uShare, pSecAttr, uCreate, uFlags, hModel ) HANDLE hModel CODE: RETVAL= CreateFileA( sPath, uAccess, uShare, - pSecAttr, uCreate, uFlags, hModel ); + (LPSECURITY_ATTRIBUTES)pSecAttr, uCreate, uFlags, hModel ); if( INVALID_HANDLE_VALUE == RETVAL ) { SaveErr( 1 ); XSRETURN_NO; @@ -170,7 +170,7 @@ CreateFileW( swPath, uAccess, uShare, pSecAttr, uCreate, uFlags, hModel ) HANDLE hModel CODE: RETVAL= CreateFileW( swPath, uAccess, uShare, - pSecAttr, uCreate, uFlags, hModel ); + (LPSECURITY_ATTRIBUTES)pSecAttr, uCreate, uFlags, hModel ); if( INVALID_HANDLE_VALUE == RETVAL ) { SaveErr( 1 ); XSRETURN_NO; @@ -246,7 +246,7 @@ DeviceIoControl( hDevice, uIoControlCode, pInBuf, lInBuf, opOutBuf, lOutBuf, olR } grow_buf_l( opOutBuf,ST(4),char *, lOutBuf,ST(5) ); RETVAL= DeviceIoControl( hDevice, uIoControlCode, pInBuf, lInBuf, - opOutBuf, lOutBuf, &olRetBytes, pOverlapped ); + opOutBuf, lOutBuf, &olRetBytes, (LPOVERLAPPED)pOverlapped ); SaveErr( !RETVAL ); OUTPUT: RETVAL @@ -553,7 +553,8 @@ ReadFile( hFile, opBuffer, lBytes, olBytesRead, pOverlapped ) if( 0 == lBytes && autosize(ST(2)) ) { lBytes= SvLEN( ST(1) ) - 1; } - RETVAL= ReadFile( hFile, opBuffer, lBytes, &olBytesRead, pOverlapped ); + RETVAL= ReadFile( hFile, opBuffer, lBytes, &olBytesRead, + (LPOVERLAPPED)pOverlapped ); SaveErr( !RETVAL ); OUTPUT: RETVAL @@ -640,7 +641,7 @@ WriteFile( hFile, pBuffer, lBytes, ouBytesWritten, pOverlapped ) "Win32API::File::WriteFile", SvCUR(ST(1)), lBytes ); } RETVAL= WriteFile( hFile, pBuffer, lBytes, - &ouBytesWritten, pOverlapped ); + &ouBytesWritten, (LPOVERLAPPED)pOverlapped ); SaveErr( !RETVAL ); OUTPUT: RETVAL |