[DVDnav-discuss] r1175 - in trunk/libdvdread/src: dvd_reader.c dvdread_internal.h

[nicodvb]

Author: nicodvb
Date: Tue Aug  4 23:21:49 2009
New Revision: 1175

Log:
replaced conditional checks on MSC with _WIN32 to permit MINGW to mount and decrypt images; patch by John Stebbins (stebbing jetheaddev com)

Modified:
   trunk/libdvdread/src/dvd_reader.c
   trunk/libdvdread/src/dvdread_internal.h

Modified: trunk/libdvdread/src/dvd_reader.c
==============================================================================
--- trunk/libdvdread/src/dvd_reader.c	Tue Jun  9 00:02:37 2009	(r1174)
+++ trunk/libdvdread/src/dvd_reader.c	Tue Aug  4 23:21:49 2009	(r1175)
@@ -333,7 +333,7 @@ dvd_reader_t *DVDOpen( const char *ppath
   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 @@ dvd_reader_t *DVDOpen( const char *ppath
   /* 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 @@ dvd_reader_t *DVDOpen( const char *ppath
       }
       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 ) {

Modified: trunk/libdvdread/src/dvdread_internal.h
==============================================================================
--- trunk/libdvdread/src/dvdread_internal.h	Tue Jun  9 00:02:37 2009	(r1174)
+++ trunk/libdvdread/src/dvdread_internal.h	Tue Aug  4 23:21:49 2009	(r1175)
@@ -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)) {                                                          \