Mercurial > mplayer.hg
diff libdvdread/libdvdread_changes.diff @ 27727:48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.
author | diego |
---|---|
date | Mon, 13 Oct 2008 16:23:55 +0000 |
parents | ea01824701a5 |
children |
line wrap: on
line diff
--- a/libdvdread/libdvdread_changes.diff Mon Oct 13 16:06:15 2008 +0000 +++ b/libdvdread/libdvdread_changes.diff Mon Oct 13 16:23:55 2008 +0000 @@ -42,6 +42,15 @@ /* Loop over all titles and call dvdcss_title to crack the keys. */ static int initAllCSSKeys( dvd_reader_t *dvd ) { +@@ -438,7 +438,7 @@ + + verbose = get_verbose(); + +-#ifdef WIN32 ++#if defined(__CYGWIN__) || defined(__MINGW32__) + /* Stat doesn't work on devices under mingwin/cygwin. */ + if( path[0] && path[1] == ':' && path[2] == '\0' ) + { @@ -494,7 +488,7 @@ char *path_copy; #if defined(SYS_BSD) @@ -51,7 +60,17 @@ FILE *mntfile; #endif -@@ -598,7 +592,7 @@ +@@ -495,7 +495,8 @@ + /* XXX: We should scream real loud here. */ + if( !(path_copy = strdup( path ) ) ) return 0; + +-#ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */ ++/* don't have fchdir, and getcwd( NULL, ... ) is strange */ ++#if !(defined(__CYGWIN__) || defined(__MINGW32__)) + /* Resolve any symlinks and get the absolut dir name. */ + { + char *new_path; +@@ -597,7 +592,7 @@ } fclose( mntfile ); } @@ -512,3 +531,7 @@ uint16_t next_pgc_nr; uint16_t prev_pgc_nr; uint16_t goup_pgc_nr; +Index: libdvdread/dvd_reader.c +=================================================================== +--- libdvdread/dvd_reader.c (revision 27759) ++++ libdvdread/dvd_reader.c (working copy)