From 4d644f513c841eaf4617edffb348338a798d37be Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 13 Oct 2008 16:23:55 +0000
Subject: Replace preprocessor check for WIN32 with checks for __MINGW32__ and
 __CYGWIN__. This avoids a pointless indirection that only obscures what is
 really done.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libdvdread/dvd_reader.c            |  5 +++--
 libdvdread/libdvdread_changes.diff | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'libdvdread')

diff --git a/libdvdread/dvd_reader.c b/libdvdread/dvd_reader.c
index 49140544e4..6e75b27693 100644
--- a/libdvdread/dvd_reader.c
+++ b/libdvdread/dvd_reader.c
@@ -438,7 +438,7 @@ dvd_reader_t *DVDOpen( const char *path )
   
   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' )
     {
@@ -495,7 +495,8 @@ dvd_reader_t *DVDOpen( const char *path )
     /* 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;
diff --git a/libdvdread/libdvdread_changes.diff b/libdvdread/libdvdread_changes.diff
index f0177aa5e5..767e5a6bcb 100644
--- a/libdvdread/libdvdread_changes.diff
+++ b/libdvdread/libdvdread_changes.diff
@@ -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)
-- 
cgit v1.2.3