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.
This commit is contained in:
Jim Ingham
1999-01-28 03:50:17 +00:00
parent 988e60c43b
commit c98fe0c119
33 changed files with 5608 additions and 553 deletions

View File

@ -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