aboutsummaryrefslogtreecommitdiff
path: root/gdb/ser-unix.c
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>1999-01-28 03:50:17 +0000
committerJim Ingham <jingham@apple.com>1999-01-28 03:50:17 +0000
commitc98fe0c11974772749686145f3172dc8c9004909 (patch)
treeb6b38dae1565e217e00060554dd6ea1f5d4cfee6 /gdb/ser-unix.c
parent988e60c43b3af56544d2181a5e3146a7787cf7bc (diff)
downloadgdb-c98fe0c11974772749686145f3172dc8c9004909.zip
gdb-c98fe0c11974772749686145f3172dc8c9004909.tar.gz
gdb-c98fe0c11974772749686145f3172dc8c9004909.tar.bz2
This is the merge of the Itcl3.0 gdbtk development branch into the
trunk. To build it, you will have to do update -dP in the itcl directory, and update tcl, tk, tix and libgui as well.
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 6b34d8b..f279c94 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 __CYGWIN__
+#ifdef __CYGWIN32__
extern void (*ui_loop_hook) PARAMS ((int));
#endif
@@ -434,7 +434,7 @@ wait_for(scb, timeout)
serial_t scb;
int timeout;
{
-#ifndef __CYGWIN__
+#ifndef __CYGWIN32__
scb->timeout_remaining = 0;
#endif
@@ -551,21 +551,21 @@ hardwire_readchar (scb, timeout)
int timeout;
{
int status;
-#ifdef __CYGWIN__
+#ifdef __CYGWIN32__
int t;
#endif
if (scb->bufcnt-- > 0)
return *scb->bufp++;
-#ifdef __CYGWIN__
+#ifdef __CYGWIN32__
if (timeout > 0)
timeout++;
#endif
while (1)
{
-#ifdef __CYGWIN__
+#ifdef __CYGWIN32__
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 __CYGWIN__
+#ifdef __CYGWIN32__
else if (scb->timeout_remaining < 0)
continue;
#endif