← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/dvd_input.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_input.c
49
49
#else
50
50
 
51
51
/* dlopening libdvdcss */
52
 
#ifdef HAVE_DLFCN_H
 
52
#if defined(HAVE_DLFCN_H) && !defined(USING_BUILTIN_DLFCN)
53
53
#include <dlfcn.h>
54
54
#else
 
55
#if defined(WIN32)
55
56
/* Only needed on MINGW at the moment */
56
 
#include "../../msvc/contrib/dlfcn.c"
 
57
#include "../msvc/contrib/dlfcn.c"
 
58
#endif
57
59
#endif
58
60
 
59
61
typedef struct dvdcss_s *dvdcss_handle;