aboutsummaryrefslogtreecommitdiff
path: root/gdb/ser-unix.c
diff options
context:
space:
mode:
authorGeoffrey Noer <noer@cygnus>1998-11-13 08:16:08 +0000
committerGeoffrey Noer <noer@cygnus>1998-11-13 08:16:08 +0000
commitd836385e11733f46b1a0b6e7c142e7317488ff36 (patch)
tree71a8ae722497db31a5864033835d6283232bd1bd /gdb/ser-unix.c
parent7c1c728ee2fe1b65446a9210b3040cba54899c5d (diff)
downloadgdb-d836385e11733f46b1a0b6e7c142e7317488ff36.zip
gdb-d836385e11733f46b1a0b6e7c142e7317488ff36.tar.gz
gdb-d836385e11733f46b1a0b6e7c142e7317488ff36.tar.bz2
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__.
Diffstat (limited to 'gdb/ser-unix.c')
-rw-r--r--gdb/ser-unix.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index f279c94..6b34d8b 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -85,7 +85,7 @@ static int hardwire_setstopbits PARAMS ((serial_t, int));
void _initialize_ser_hardwire PARAMS ((void));
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
extern void (*ui_loop_hook) PARAMS ((int));
#endif
@@ -434,7 +434,7 @@ wait_for(scb, timeout)
serial_t scb;
int timeout;
{
-#ifndef __CYGWIN32__
+#ifndef __CYGWIN__
scb->timeout_remaining = 0;
#endif
@@ -551,21 +551,21 @@ hardwire_readchar (scb, timeout)
int timeout;
{
int status;
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
int t;
#endif
if (scb->bufcnt-- > 0)
return *scb->bufp++;
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
if (timeout > 0)
timeout++;
#endif
while (1)
{
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
t = timeout == 0 ? 0 : 1;
scb->timeout_remaining = timeout < 0 ? timeout : timeout - t;
status = wait_for (scb, t);
@@ -592,7 +592,7 @@ hardwire_readchar (scb, timeout)
timeout = scb->timeout_remaining;
continue;
}
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
else if (scb->timeout_remaining < 0)
continue;
#endif