[libdvdcss-devel] [PATCH 2/2] device: Eliminate some unnecessary ifdefs

[Diego Biurrun]

Signed-off-by: Diego Biurrun <***@biurrun.de>
---
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 */