[libdvdcss-devel] build: Drop unnecessary local SYS_CYGWIN config.h #define

[Diego Biurrun]

libdvdcss | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Feb 13 14:43:50 2013 +0100| [0938da8a3ebb4b9e1e3c2383a4821fa8eb524a87] | committer: Jean-Baptiste Kempf

build: Drop unnecessary local SYS_CYGWIN config.h #define

__CYGWIN__ is always available and can be used instead.

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=0938da8a3ebb4b9e1e3c2383a4821fa8eb524a87
---

 configure.ac  |    6 ------
 msvc/config.h |    1 -
 src/device.c  |    2 +-
 src/device.h  |    4 ++--
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 44ff25c..11af070 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,12 +27,6 @@ case x"${target_os}" in
     CFLAGS="${CFLAGS} -no-cpp-precomp"
     ;;
   x*cygwin*)
-    dnl Check if we are using the mno-cygwin mode in which case we are
-    dnl actually dealing with a mingw32 compiler.
-    AC_EGREP_CPP(yes, [#ifndef WIN32
-                       yes
-                       #endif],
-                 AC_DEFINE(SYS_CYGWIN, 1, Have a Cygwin system.))
     AC_DEFINE(WIN32, 1, Using Win32.)
     ;;
   xbeos*)
diff --git a/msvc/config.h b/msvc/config.h
index d61b8c1..f5c86ce 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -39,7 +39,6 @@
 /* #undef SOLARIS_USCSI */
 #define STDC_HEADERS 1
 /* #undef SYS_BEOS */
-/* #undef SYS_CYGWIN */
 #define VERSION "1.2.11"
 /* #undef const */
 /* #undef inline */
diff --git a/src/device.c b/src/device.c
index 46a936a..9e55737 100644
--- a/src/device.c
+++ b/src/device.c
@@ -49,7 +49,7 @@
 #   include <limits.h>
 #endif
 
-#if defined( WIN32 ) && !defined( SYS_CYGWIN )
+#if defined( WIN32 ) && !defined( __CYGWIN__ )
 #   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
diff --git a/src/device.h b/src/device.h
index ddaa18e..ed701b1 100644
--- a/src/device.h
+++ b/src/device.h
@@ -29,7 +29,7 @@
 /*****************************************************************************
  * iovec structure: vectored data entry
  *****************************************************************************/
-#if defined( WIN32 ) && !defined( SYS_CYGWIN )
+#if defined( WIN32 ) && !defined( __CYGWIN__ )
 #   include <io.h>                                                 /* read() */
 #else
 #   include <sys/types.h>
@@ -38,7 +38,7 @@
 
 #include "dvdcss/dvdcss.h"
 
-#if defined( WIN32 ) && !defined( SYS_CYGWIN )
+#if defined( WIN32 ) && !defined( __CYGWIN__ )
 struct iovec
 {
     void *iov_base;     /* Pointer to data. */