Fri Nov 13 00:15:08 1998 Geoffrey Noer <noer@cygnus.com>

        Changes to account for name change from cygwin32 to cygwin and
        clean up Win32-related ifdefs.

        * configure.tgt: check for cygwin* instead of cygwin32.
        New cygwin gdb_target variable loses the "32".
        * configure.host: check for cygwin* instead of cygwin32.
        New cygwin gdb_host variable loses the "32".
        * configure.in: test __CYGWIN__ instead of __CYGWIN32__,
        rename gdb_cv_os_cygwin32 variable to drop the "32".  Call
        AM_EXEEXT instead of AC_EXEEXT since that isn't in a released
        autoconf yet.
        * configure: regenerate.

        * main.c: drop "32" from cygwin_ funcs, include sys/cygwin.h
          where
        cygwin path conv protos live, instead of adding a proto here
          for
        them here.
        * {main.c, ser-tcp.c, ser-unix.c, top.c}: check __CYGWIN__
        instead of __CYGWIN32__.
        * source.c: thoughout, check _WIN32 instead of WIN32.

        * config/i386/cygwin32.mh: delete.
        * config/i386/cygwin.mh: new file, was cygwin32.mh.
        * config/i386/cygwin32.mt: delete.
        * config/i386/cygwin.mt: new file, was cygwin32.mt.
        * config/i386/tm-cygwin32.h: delete.
        * config/i386/tm-cygwin.h: new file, was tm-cygwin32.h.
        * config/i386/xm-cygwin32.h: delete.
        * config/i386/xm-cygwin.h: new file, was xm-cygwin32.h.
        * config/i386/xm-windows.h: #include xm-cygwin.h now.
        * config/powerpc/cygwin32.mh: delete.
        * config/powerpc/cygwin.mh: new file, was cygwin32.mh.
        * config/powerpc/cygwin32.mt: delete.
        * config/powerpc/cygwin.mt: new file, was cygwin32.mt.
        * config/powerpc/tm-cygwin32.h: delete.
        * config/powerpc/tm-cygwin.h: new file, was tm-cygwin32.h.
        * config/powerpc/xm-cygwin32.h: delete.
        * config/powerpc/xm-cygwin.h: new file, was xm-cygwin32.h.

        * rdi-share/aclocal.m4: regenerate with aclocal.
        * rdi-share/configure: regenerate with autoconf.
        * rdi-share/{host.h, hostchan.c, hostchan.h, serdrv.c,
        * serpardr.c,
        unixcomm.c}: check __CYGWIN__ instead of __CYGWIN32__.

1 files changed, 15 insertions, 15 deletions

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index d051caca99a..18a36d571c8 100644
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -71,7 +71,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "annotate.h"
 #include <sys/time.h>
 
-/* For Cygwin32, we use a timer to periodically check for Windows
+/* For Cygwin, we use a timer to periodically check for Windows
    messages.  FIXME: It would be better to not poll, but to instead
    rewrite the target_wait routines to serve as input sources.
    Unfortunately, that will be a lot of work.  */
@@ -329,7 +329,7 @@ gdbtk_init ( argv0 )
      causing gdb to abort.  If instead we simply return here, gdb will
      gracefully degrade to using the command line interface. */
 
-#ifndef WINNT
+#ifndef _WIN32
   if (getenv ("DISPLAY") == NULL)
     return;
 #endif
@@ -444,7 +444,7 @@ gdbtk_init ( argv0 )
    * These are the commands to do some Windows Specific stuff...
    */
   
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
   if (ide_create_messagebox_command (gdbtk_interp) != TCL_OK)
     error ("messagebox command initialization failed");
   /* On Windows, create a sizebox widget command */
@@ -679,15 +679,15 @@ _initialize_gdbtk ()
       /* Tell the rest of the world that Gdbtk is now set up. */
 
       init_ui_hook = gdbtk_init;
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
       (void) FreeConsole ();
 #endif
     }
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
   else
     {
       DWORD ft = GetFileType (GetStdHandle (STD_INPUT_HANDLE));
-      void cygwin32_attach_handle_to_fd (char *, int, HANDLE, int, int);
+      void cygwin_attach_handle_to_fd (char *, int, HANDLE, int, int);
 
       switch (ft)
 	{
@@ -697,15 +697,15 @@ _initialize_gdbtk ()
 	    break;
 	  default:
 	    AllocConsole();
-	    cygwin32_attach_handle_to_fd ("/dev/conin", 0,
-					  GetStdHandle (STD_INPUT_HANDLE),
-					  1, GENERIC_READ);
-	    cygwin32_attach_handle_to_fd ("/dev/conout", 1,
-					  GetStdHandle (STD_OUTPUT_HANDLE),
-					  0, GENERIC_WRITE);
-	    cygwin32_attach_handle_to_fd ("/dev/conout", 2,
-					  GetStdHandle (STD_ERROR_HANDLE),
-					  0, GENERIC_WRITE);
+	    cygwin_attach_handle_to_fd ("/dev/conin", 0,
+					GetStdHandle (STD_INPUT_HANDLE),
+					1, GENERIC_READ);
+	    cygwin_attach_handle_to_fd ("/dev/conout", 1,
+					GetStdHandle (STD_OUTPUT_HANDLE),
+					0, GENERIC_WRITE);
+	    cygwin_attach_handle_to_fd ("/dev/conout", 2,
+					GetStdHandle (STD_ERROR_HANDLE),
+					0, GENERIC_WRITE);
 	    break;
 	}
     }