diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-21 11:41:30 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-21 11:41:30 +0000 |
| commit | 7f5a85dbcbc791e0301af400e8d28021193f6fee (patch) | |
| tree | e87092a86767c8617cf45f77ac421ec148ac5abb | |
| parent | fe4102bd5c014ab47c354c7fa893ffd29615e309 (diff) | |
Update for latest Cygwin-related changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15536 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdvdkit2/libdvdread_changes.diff | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff index fdeceab177..ce062ce7c2 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/libmpdvdkit2/libdvdread_changes.diff @@ -343,7 +343,8 @@ +#include </usr/conf/h/mnttab.h> #elif defined(SYS_BSD) #include <fstab.h> - #elif defined(__linux__) +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__CYGWIN__) #include <mntent.h> #endif @@ -426,6 +427,15 @@ /* Try to open libdvdcss or fall back to standard functions */ have_css = DVDInputSetup(); +@@ -274,7 +320,7 @@ + char *path_copy; + #if defined(SYS_BSD) + struct fstab* fe; +-#elif defined(__sun) || defined(__linux__) ++#elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__) + FILE *mntfile; + #endif + @@ -289,7 +331,9 @@ if( cdir >= 0 ) { chdir( path_copy ); @@ -436,11 +446,20 @@ close( cdir ); if( new_path ) { free( path_copy ); +@@ -345,7 +393,7 @@ + } + fclose( mntfile ); + } +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__CYGWIN__) + mntfile = fopen( MOUNTED, "r" ); + if( mntfile ) { + struct mntent *me; @@ -364,6 +408,9 @@ } fclose( mntfile ); } -+#elif defined(WIN32) ++#elif defined(__MINGW32__) + dev_name = strdup(path); + auth_drive = DVDOpenImageFile( path, have_css ); #endif |