summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/dvdnav.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/libdvdnav/dvdnav.h')
-rw-r--r--src/input/libdvdnav/dvdnav.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/input/libdvdnav/dvdnav.h b/src/input/libdvdnav/dvdnav.h
index 44ef878e1..69fa44c5c 100644
--- a/src/input/libdvdnav/dvdnav.h
+++ b/src/input/libdvdnav/dvdnav.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dvdnav.h,v 1.11 2003/04/22 23:30:36 tchamp Exp $
+ * $Id: dvdnav.h,v 1.12 2003/04/29 15:58:30 jcdutton Exp $
*
*/
@@ -33,21 +33,18 @@
extern "C" {
#endif
-#ifdef HAVE_DVDNAV
-#ifndef _MSC_VER
-# include <dvdnav/dvdnav_events.h>
-# include <dvdnav/dvd_types.h>
-#else
+#ifdef DVDNAV_COMPILE
# include "dvdnav_events.h"
# include "dvd_types.h"
-#endif /* _MSC_VER */
+# include "dvd_reader.h"
+# include "ifo_types.h" /* For vm_cmd_t */
#else
-# include "dvdnav_events.h"
-# include "dvd_types.h"
+# include <dvdnav/dvdnav_events.h>
+# include <dvdnav/dvd_types.h>
+# include <dvdnav/dvd_reader.h>
+# include <dvdnav/ifo_types.h> /* For vm_cmd_t */
#endif
-#include "dvd_reader.h"
-#include "ifo_types.h" /* For vm_cmd_t */
/*********************************************************************