From a85e81a2ff4fb1afc05ff74d5da573031c3495e0 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 18 Apr 2003 07:22:01 -0400
Subject: [PATCH] configure.in: Remove CYGWIN definition; we will use the 
 automatically defined __CYGWIN__ instead.

---
 ChangeLog            |  5 +++++
 configure            | 10 +++-------
 configure.in         |  1 -
 lib/ext2fs/ChangeLog |  4 ++++
 lib/ext2fs/unix_io.c |  6 +++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e8ed33..71b0f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18  Theodore Ts'o  <tytso@mit.edu>
+
+	* configure.in: Remove CYGWIN definition; we will use the
+		automatically defined __CYGWIN__ instead.
+
 2003-03-22  Theodore Ts'o  <tytso@mit.edu>
 
 	* configure.in: Add E2FSPROGS_DAY expansion.  Add
diff --git a/configure b/configure
index 9ebc5a1..708ef3e 100644
--- a/configure
+++ b/configure
@@ -4958,10 +4958,6 @@ linux*)
 cygwin)
 	CYGWIN_CMT=
 	UNIX_CMT="#"
-	cat >> confdefs.h <<\EOF
-#define WIN32 1
-EOF
-
 	;;
 esac
 
@@ -5009,20 +5005,20 @@ fi
 
 
 echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
-echo "configure:5013: checking whether linker accepts -static" >&5
+echo "configure:5009: checking whether linker accepts -static" >&5
 if eval "test \"`echo '$''{'ac_cv_e2fsprogs_use_static'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
 cat > conftest.$ac_ext <<EOF
-#line 5019 "configure"
+#line 5015 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 fflush(stdout);
 ; return 0; }
 EOF
-if { (eval echo configure:5026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_e2fsprogs_use_static=yes
 else
diff --git a/configure.in b/configure.in
index 01e8290..6f22d55 100644
--- a/configure.in
+++ b/configure.in
@@ -689,7 +689,6 @@ linux*)
 cygwin)
 	CYGWIN_CMT=
 	UNIX_CMT="#"
-	AC_DEFINE(CYGWIN)
 	;;
 esac
 AC_SUBST(LINUX_CMT)
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 8d79805..71fe43f 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-18  Theodore Ts'o  <tytso@mit.edu>
+
+	* unix_io.c: Use __CYGWIN__ instead of CYGWIN.
+
 2003-04-17  Theodore Ts'o  <tytso@mit.edu>
 
 	* getsize.c: Add Cygwin/Windows version of ext2fs_get_device_size()
diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index aa9ff14..ae498da 100644
--- a/lib/ext2fs/unix_io.c
+++ b/lib/ext2fs/unix_io.c
@@ -94,7 +94,7 @@ static struct struct_io_manager struct_unix_manager = {
 	unix_read_blk,
 	unix_write_blk,
 	unix_flush,
-#ifdef CYGWIN
+#ifdef __CYGWIN__
 	0
 #else
 	unix_write_byte
@@ -106,7 +106,7 @@ io_manager unix_io_manager = &struct_unix_manager;
 /*
  * Here are the raw I/O functions
  */
-#ifndef CYGWIN
+#ifndef __CYGWIN__
 static errcode_t raw_read_blk(io_channel channel,
 			      struct unix_private_data *data,
 			      unsigned long block,
@@ -139,7 +139,7 @@ error_out:
 					       size, actual, retval);
 	return retval;
 }
-#else /* CYGWIN */
+#else /* __CYGWIN__ */
 /*
  * Windows block devices only allow sector alignment IO in offset and size
  */
-- 
1.8.3.1