[libdvdcss-devel] device: Eliminate some unnecessary ifdefs

[Diego Biurrun]

libdvdcss | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Feb 13 22:50:01 2013 +0100| [0e48b8313f3b70bc0cb0806385f4c5786efd0c64] | committer: Jean-Baptiste Kempf

device: Eliminate some unnecessary ifdefs

Signed-off-by: Diego Biurrun <diego at biurrun.de>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=0e48b8313f3b70bc0cb0806385f4c5786efd0c64
---

 src/device.h |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/device.h b/src/device.h
index e5524eb..9ad24b0 100644
--- a/src/device.h
+++ b/src/device.h
@@ -31,21 +31,18 @@
  *****************************************************************************/
 #if defined( WIN32 ) && !defined( __CYGWIN__ )
 #   include <io.h>                                                 /* read() */
-#else
-#   include <sys/types.h>
-#   include <sys/uio.h>                                      /* struct iovec */
-#endif
-
-#include "dvdcss/dvdcss.h"
-
-#if defined( WIN32 ) && !defined( __CYGWIN__ )
 struct iovec
 {
     void *iov_base;     /* Pointer to data. */
     size_t iov_len;     /* Length of data.  */
 };
+#else
+#   include <sys/types.h>
+#   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
+#include "dvdcss/dvdcss.h"
+
 /*****************************************************************************
  * Device reading prototypes
  *****************************************************************************/
@@ -57,8 +54,6 @@ int  _dvdcss_close      ( dvdcss_t );
 /*****************************************************************************
  * Device reading prototypes, raw-device specific
  *****************************************************************************/
-#if !defined(WIN32) && !defined(__OS2__)
 int _dvdcss_raw_open     ( dvdcss_t, char const * );
-#endif
 
 #endif /* DVDCSS_DEVICE_H */