From 2196638d08bdb82200ebee2b9a2f68ff91a06f48 Mon Sep 17 00:00:00 2001
From: Geoffrey Noer <noer@cygnus>
Date: Thu, 19 Nov 1998 23:22:51 +0000
Subject: [PATCH] Thu Nov 19 15:21:04 1998  Geoffrey Noer  <noer@cygnus.com>

        * rdi-share/host.h: if compiling under Cygwin, make sure new
        preprocessor define is defined.  Define it if not.
        * rdi-share/aclocal.m4: regenerate
        * rdi-share/configure: regenerate
---
 gdb/ChangeLog            |  7 +++++++
 gdb/rdi-share/aclocal.m4 | 16 +---------------
 gdb/rdi-share/configure  |  2 +-
 gdb/rdi-share/host.h     |  8 ++++++++
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b770b3ea17f..6454f4975ae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 19 15:21:04 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* rdi-share/host.h: if compiling under Cygwin, make sure new
+	preprocessor define is defined.  Define it if not.
+	* rdi-share/aclocal.m4: regenerate
+	* rdi-share/configure: regenerate
+
 Thu Nov 19 14:43:44 1998  Geoffrey Noer  <noer@cygnus.com>
 
 	* configure.in: switch back to checking __CYGWIN32__
diff --git a/gdb/rdi-share/aclocal.m4 b/gdb/rdi-share/aclocal.m4
index ab1e3e2066a..55a8225b960 100644
--- a/gdb/rdi-share/aclocal.m4
+++ b/gdb/rdi-share/aclocal.m4
@@ -179,26 +179,12 @@ AC_SUBST(EXEEXT)])
 dnl AM_CYGWIN()
 AC_DEFUN(AM_CYGWIN,
 [AC_CACHE_CHECK(for Cygwin environment, am_cv_cygwin,
-[AC_TRY_COMPILE(,[return __CYGWIN__;],
+[AC_TRY_COMPILE(,[return __CYGWIN32__;],
 am_cv_cygwin=yes, am_cv_cygwin=no)
 rm -f conftest*])
 CYGWIN=
 test "$am_cv_cygwin" = yes && CYGWIN=yes])
 
-# Check to see if we're running under Cygwin32, without using
-# AC_CANONICAL_*.  If so, set output variable CYGWIN32 to "yes".
-# Otherwise set it to "no".
-# Note: Although Cygwin32 has changed names, for now we keep the
-# old macro around...
-
-dnl AM_CYGWIN32()
-AC_DEFUN(AM_CYGWIN32,
-[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-am_cv_cygwin32=yes, am_cv_cygwin32=no)
-rm -f conftest*])
-CYGWIN32=
-test "$am_cv_cygwin32" = yes && CYGWIN32=yes])
 
 
 # Check to see if we're running under Mingw, without using
diff --git a/gdb/rdi-share/configure b/gdb/rdi-share/configure
index 6729f7c9a90..e85f4f80cd4 100755
--- a/gdb/rdi-share/configure
+++ b/gdb/rdi-share/configure
@@ -1759,7 +1759,7 @@ else
 #include "confdefs.h"
 
 int main() {
-return __CYGWIN__;
+return __CYGWIN32__;
 ; return 0; }
 EOF
 if { (eval echo configure:1766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
diff --git a/gdb/rdi-share/host.h b/gdb/rdi-share/host.h
index ba09d82c29d..e30d965bee3 100644
--- a/gdb/rdi-share/host.h
+++ b/gdb/rdi-share/host.h
@@ -219,4 +219,12 @@ extern double strtod(const char *str, char **ptr);
 
 #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
+
 /* end of host.h */
-- 
2.30.2