Commit 4f8804bd authored by John Stebbins's avatar John Stebbins
Browse files

replaced conditional checks on MSC with _WIN32 to permit MINGW to mount and decrypt images;

parent 53f03f4f
...@@ -333,7 +333,7 @@ dvd_reader_t *DVDOpen( const char *ppath ) ...@@ -333,7 +333,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
char *dev_name = NULL; char *dev_name = NULL;
char *path = NULL, *new_path = NULL, *path_copy = NULL; char *path = NULL, *new_path = NULL, *path_copy = NULL;
#ifdef _MSC_VER #ifdef _WIN32
int len; int len;
#endif #endif
...@@ -347,7 +347,7 @@ dvd_reader_t *DVDOpen( const char *ppath ) ...@@ -347,7 +347,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
/* Try to open libdvdcss or fall back to standard functions */ /* Try to open libdvdcss or fall back to standard functions */
have_css = dvdinput_setup(); have_css = dvdinput_setup();
#ifdef _MSC_VER #ifdef _WIN32
/* Strip off the trailing \ if it is not a drive */ /* Strip off the trailing \ if it is not a drive */
len = strlen(path); len = strlen(path);
if ((len > 1) && if ((len > 1) &&
...@@ -506,11 +506,11 @@ dvd_reader_t *DVDOpen( const char *ppath ) ...@@ -506,11 +506,11 @@ dvd_reader_t *DVDOpen( const char *ppath )
} }
fclose( mntfile ); fclose( mntfile );
} }
#elif defined(_MSC_VER) || defined(__OS2__) #elif defined(_WIN32) || defined(__OS2__)
auth_drive = DVDOpenImageFile( path, have_css ); auth_drive = DVDOpenImageFile( path, have_css );
#endif #endif
#if !defined(_MSC_VER) && !defined(__OS2__) #if !defined(_WIN32) && !defined(__OS2__)
if( !dev_name ) { if( !dev_name ) {
fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); fprintf( stderr, "libdvdread: Couldn't find device name.\n" );
} else if( !auth_drive ) { } else if( !auth_drive ) {
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef LIBDVDREAD_DVDREAD_INTERNAL_H #ifndef LIBDVDREAD_DVDREAD_INTERNAL_H
#define LIBDVDREAD_DVDREAD_INTERNAL_H #define LIBDVDREAD_DVDREAD_INTERNAL_H
#ifdef _MSC_VER #ifdef _WIN32
#include <unistd.h> #include <unistd.h>
#endif /* _MSC_VER */ #endif /* _WIN32 */
#define CHECK_VALUE(arg) \ #define CHECK_VALUE(arg) \
if(!(arg)) { \ if(!(arg)) { \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment