Mercurial > libdvdread4.hg
changeset 41:ef679522d00f src
replaced conditional checks on MSC with _WIN32 to permit MINGW to mount and decrypt images; patch by John Stebbins (stebbing jetheaddev com)
| author | nicodvb |
|---|---|
| date | Tue, 04 Aug 2009 21:21:49 +0000 |
| parents | ce7056d60f01 |
| children | 3aa39a1cff0f |
| files | dvd_reader.c dvdread_internal.h |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dvd_reader.c Mon Jun 08 22:02:37 2009 +0000 +++ b/dvd_reader.c Tue Aug 04 21:21:49 2009 +0000 @@ -333,7 +333,7 @@ char *dev_name = NULL; char *path = NULL, *new_path = NULL, *path_copy = NULL; -#ifdef _MSC_VER +#ifdef _WIN32 int len; #endif @@ -347,7 +347,7 @@ /* Try to open libdvdcss or fall back to standard functions */ have_css = dvdinput_setup(); -#ifdef _MSC_VER +#ifdef _WIN32 /* Strip off the trailing \ if it is not a drive */ len = strlen(path); if ((len > 1) && @@ -506,11 +506,11 @@ } fclose( mntfile ); } -#elif defined(_MSC_VER) || defined(__OS2__) +#elif defined(_WIN32) || defined(__OS2__) auth_drive = DVDOpenImageFile( path, have_css ); #endif -#if !defined(_MSC_VER) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__OS2__) if( !dev_name ) { fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); } else if( !auth_drive ) {
--- a/dvdread_internal.h Mon Jun 08 22:02:37 2009 +0000 +++ b/dvdread_internal.h Tue Aug 04 21:21:49 2009 +0000 @@ -19,9 +19,9 @@ #ifndef LIBDVDREAD_DVDREAD_INTERNAL_H #define LIBDVDREAD_DVDREAD_INTERNAL_H -#ifdef _MSC_VER +#ifdef _WIN32 #include <unistd.h> -#endif /* _MSC_VER */ +#endif /* _WIN32 */ #define CHECK_VALUE(arg) \ if(!(arg)) { \