Some heavy changes today:

[vlc] / extras / libdvdcss / ioctl.c

diff --git a/extras/libdvdcss/ioctl.c b/extras/libdvdcss/ioctl.c
index a2ffa059134f20fc852d43c4338c6f298be22bdb..422c08d49af02edb72699704f9a18221d364d8ee 100644 (file)
--- a/extras/libdvdcss/ioctl.c
+++ b/extras/libdvdcss/ioctl.c
@@ -2,7 +2,7 @@
  * ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.18 2001/12/18 02:44:34 sam Exp $
+ * $Id: ioctl.c,v 1.19 2001/12/30 07:09:54 sam Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -29,13 +29,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdio.h>
 
 #include <string.h>                                    /* memcpy(), memset() */
 #include <sys/types.h>
 
+#include <videolan/vlc.h>
+
 #if defined( WIN32 )
 #   include <windows.h>
 #   include <winioctl.h>
@@ -73,8 +73,6 @@
 #   include <sys/scsi/impl/uscsi.h>
 #endif
 
-#include "common.h"
-
 #ifdef SYS_DARWIN
 #   include <IOKit/storage/IODVDMediaBSDClient.h>
 /* #   include "DVDioctl/DVDioctl.h" */