diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a33dba9073..0b7614d7aea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2001-03-01  J.T. Conklin  <jtc@redback.com>
 
+	* defs.h (__CYGWIN__): Moved conditional which defines __CYGWIN__
+ 	if __CYGWIN32__ is set from here.
+	* config/i386/xm-cygwin.h: To here.
+	* config/powerpc/xm-cygwin.h: To here.
+
 	* i386-stub.c (handle_exception): Use 'T' response packet.
 
 2001-03-01  Michael Snyder  <msnyder@mvstp600e.cygnus.com>
diff --git a/gdb/config/i386/xm-cygwin.h b/gdb/config/i386/xm-cygwin.h
index 863992c22af..1e210c76da9 100644
--- a/gdb/config/i386/xm-cygwin.h
+++ b/gdb/config/i386/xm-cygwin.h
@@ -1,5 +1,5 @@
 /* Definitions for hosting on WIN32, for GDB.
-   Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -33,3 +33,11 @@
 #define CRLF_SOURCE_FILES
 
 #define HAVE_SIGSETMASK 0
+
+/* If under Cygwin, provide backwards compatibility with older
+   Cygwin compilers that don't define the current cpp define. */
+#ifdef __CYGWIN32__
+#ifndef __CYGWIN__
+#define __CYGWIN__
+#endif
+#endif 
diff --git a/gdb/config/powerpc/xm-cygwin.h b/gdb/config/powerpc/xm-cygwin.h
index 2993606285f..2756a9ea61e 100644
--- a/gdb/config/powerpc/xm-cygwin.h
+++ b/gdb/config/powerpc/xm-cygwin.h
@@ -1,5 +1,5 @@
 /* Definitions for hosting on WIN32, for GDB.
-   Copyright 1995, 1996, 1998 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -31,3 +31,11 @@
 
 /* Define this lseek(n) != nth byte of file */
 #define LSEEK_NOT_LINEAR
+
+/* If under Cygwin, provide backwards compatibility with older
+   Cygwin compilers that don't define the current cpp define. */
+#ifdef __CYGWIN32__
+#ifndef __CYGWIN__
+#define __CYGWIN__
+#endif
+#endif 
diff --git a/gdb/defs.h b/gdb/defs.h
index c1ca4a76569..2766d457e8e 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -1259,14 +1259,6 @@ extern int use_windows;
 #define MERGEPID(PID, TID) (PID)
 #endif
 
-/* If under Cygwin, provide backwards compatibility with older
-   Cygwin compilers that don't define the current cpp define. */
-#ifdef __CYGWIN32__
-#ifndef __CYGWIN__
-#define __CYGWIN__
-#endif
-#endif
-
 /* Define well known filenos if the system does not define them.  */
 #ifndef STDIN_FILENO
 #define STDIN_FILENO   0