← Back to branch summary

~ubuntu-branches/ubuntu/raring/libdvdread/raring-proposed

« back to all changes in this revision

Viewing changes to src/dvd_reader.c

  • Committer: Package Import Robot
  • Author(s): Vibhav Pant
  • Date: 2012-12-15 17:06:42 UTC
  • mfrom: (1.3.2) (3.2.15 sid)
  • Revision ID: package-import@ubuntu.com-20121215170642-q0h4cc4r2mchkgcl
Tags: 4.2.0+20121016-1ubuntu1
https://launchpad.net/bugs/1090692
* Merge from Debian unstable (LP: #1090692).  Remaining changes:
  - Re-add missing install-css.sh.
  - debian/control: add Suggests for install-css.sh on debhelper,
    fakeroot, and build-essential.
  - debian/rules: install install-css.sh, leave perms executable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dvd_reader.c
37
37
 
38
38
/* misc win32 helpers */
39
39
#ifdef WIN32
 
40
#include <windows.h>
40
41
#ifndef HAVE_GETTIMEOFDAY
41
42
/* replacement gettimeofday implementation */
42
43
#include <sys/timeb.h>
557
558
      }
558
559
      fclose( mntfile );
559
560
    }
560
 
#elif defined(_WIN32) || defined(__OS2__)
561
 
#ifdef __OS2__
 
561
#elif defined(__OS2__)
562
562
    /* Use DVDOpenImageFile() only if it is a drive */
563
563
    if(isalpha(path[0]) && path[1] == ':' &&
564
564
        ( !path[2] ||
565
565
          ((path[2] == '\\' || path[2] == '/') && !path[3])))
566
 
#endif
567
566
    auth_drive = DVDOpenImageFile( path, have_css );
 
567
#elif defined(_WIN32)
 
568
    if( GetDriveType( path_copy ) == DRIVE_CDROM ) {
 
569
      path_copy[2] = '\0';
 
570
      auth_drive = DVDOpenImageFile( path_copy, have_css );
 
571
    }
568
572
#endif
569
573
 
570
574
#if !defined(_WIN32) && !defined(__OS2__)