diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a09a843ae1..b770b3ea17 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 14:43:44 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: switch back to checking __CYGWIN32__
+	* configure: regenerate
+
 Thu Nov 19 09:53:00 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* exec.c (exec_file_command): Cleanup. Replace #if
diff --git a/gdb/configure b/gdb/configure
index 915cb74c66..e7d24843b9 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -4901,7 +4901,7 @@ else
 #line 4902 "configure"
 #include "confdefs.h"
 
-#ifdef __CYGWIN__
+#ifdef __CYGWIN32__
 lose
 #endif
 EOF
@@ -5986,7 +5986,7 @@ else
 #include "confdefs.h"
 
 int main() {
-return __CYGWIN__;
+return __CYGWIN32__;
 ; return 0; }
 EOF
 if { (eval echo configure:5993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
diff --git a/gdb/configure.in b/gdb/configure.in
index fb7f775425..767e0daf48 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -550,7 +550,7 @@ case "$host" in
 # In the Cygwin environment, we need some additional flags.
 AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
 [AC_EGREP_CPP(lose, [
-#ifdef __CYGWIN__
+#ifdef __CYGWIN32__
 lose
 #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])