ref: 0e48b8313f3b70bc0cb0806385f4c5786efd0c64
parent: 77f561a53feaf5b2ebaf55e00e43189c8b9be237
author: Diego Biurrun <diego@biurrun.de>
date: Wed Feb 13 17:50:01 EST 2013
device: Eliminate some unnecessary ifdefs Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
--- 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 @@
/*****************************************************************************
* Device reading prototypes, raw-device specific
*****************************************************************************/
-#if !defined(WIN32) && !defined(__OS2__)
int _dvdcss_raw_open ( dvdcss_t, char const * );
-#endif
#endif /* DVDCSS_DEVICE_H */