diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-07 13:36:21 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-07 13:36:21 +0000 |
| commit | 7bd96cce9e66649cb0144373377b81cbdb905c86 (patch) | |
| tree | 5281b76bfe6a02017d04c55aa7d8d10fee124fd4 /libmpdvdkit2 | |
| parent | 969ab879f4df592314250fa8951d705f2808607a (diff) | |
| download | mpv-7bd96cce9e66649cb0144373377b81cbdb905c86.tar.bz2 mpv-7bd96cce9e66649cb0144373377b81cbdb905c86.tar.xz | |
mingw gcc 4.1 support patch by Gianluigi Tiesi <mplayer at netfarm.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15690 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
| -rw-r--r-- | libmpdvdkit2/device.c | 12 | ||||
| -rw-r--r-- | libmpdvdkit2/ioctl.h | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libmpdvdkit2/device.c b/libmpdvdkit2/device.c index 7f0529c8bd..7b50e912f8 100644 --- a/libmpdvdkit2/device.c +++ b/libmpdvdkit2/device.c @@ -273,14 +273,14 @@ static int win2k_open ( dvdcss_t dvdcss, char const *psz_device ) * won't send back the right result). * (See Microsoft Q241374: Read and Write Access Required for SCSI * Pass Through Requests) */ - (HANDLE) dvdcss->i_fd = + dvdcss->i_fd = (int) CreateFile( psz_dvd, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL ); if( (HANDLE) dvdcss->i_fd == INVALID_HANDLE_VALUE ) - (HANDLE) dvdcss->i_fd = + dvdcss->i_fd = (int) CreateFile( psz_dvd, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL ); @@ -302,8 +302,8 @@ static int aspi_open( dvdcss_t dvdcss, char const * psz_device ) DWORD dwSupportInfo; struct w32_aspidev *fd; int i, j, i_hostadapters; - long (*lpGetSupport)( void ); - long (*lpSendCommand)( void* ); + GETASPI32SUPPORTINFO lpGetSupport; + SENDASPI32COMMAND lpSendCommand; char c_drive = psz_device[0]; /* load aspi and init w32_aspidev structure */ @@ -314,8 +314,8 @@ static int aspi_open( dvdcss_t dvdcss, char const * psz_device ) return -1; } - (FARPROC) lpGetSupport = GetProcAddress( hASPI, "GetASPI32SupportInfo" ); - (FARPROC) lpSendCommand = GetProcAddress( hASPI, "SendASPI32Command" ); + lpGetSupport = (GETASPI32SUPPORTINFO) GetProcAddress( hASPI, "GetASPI32SupportInfo" ); + lpSendCommand = (SENDASPI32COMMAND) GetProcAddress( hASPI, "SendASPI32Command" ); if(lpGetSupport == NULL || lpSendCommand == NULL ) { diff --git a/libmpdvdkit2/ioctl.h b/libmpdvdkit2/ioctl.h index 13c095e60a..dae4ece121 100644 --- a/libmpdvdkit2/ioctl.h +++ b/libmpdvdkit2/ioctl.h @@ -318,6 +318,9 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT * win32 aspi specific *****************************************************************************/ +typedef WINAPI DWORD (*GETASPI32SUPPORTINFO)(VOID); +typedef WINAPI DWORD (*SENDASPI32COMMAND)(LPVOID); + #define WIN2K ( GetVersion() < 0x80000000 ) #define ASPI_HAID 0 #define ASPI_TARGET 0 @@ -339,7 +342,7 @@ struct w32_aspidev long hASPI; short i_sid; int i_blocks; - long (*lpSendCommand)( void* ); + SENDASPI32COMMAND lpSendCommand; }; #pragma pack(1) |