diff options
| -rw-r--r-- | gdb/ChangeLog | 17 | ||||
| -rw-r--r-- | gdb/Makefile.in | 1 | ||||
| -rw-r--r-- | gdb/mon960-rom.c | 12 | ||||
| -rw-r--r-- | gdb/remote-array.c | 1 | ||||
| -rw-r--r-- | gdb/ser-e7kpc.c | 2 | ||||
| -rw-r--r-- | gdb/utils.c | 87 |
6 files changed, 47 insertions, 73 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fd62f50..bb2d82b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,8 +1,25 @@ +Mon Jul 28 14:04:39 1997 Felix Lee <flee@cygnus.com> + + * Makefile.in (init.c): don't try to scan mswin for _initialize + funcs. (generates misleading error message because files have + .cpp suffix, not .c suffix) + +Mon Jul 28 13:27:21 1997 Felix Lee <flee@cygnus.com> + + * ser-e7kpc.c: <w32sut.h> -> "mswin/w32sut.h" + Mon Jul 28 02:54:31 1997 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) * xcoffread.c (coff_getfilename): Do not strip directory component of filename. +Fri Jul 25 15:16:15 1997 Felix Lee <flee@cygnus.com> + + * mon960-rom.c: removed unused #includes; no ioctl.h in Windows. + * nindy-share/ttyflush.c: find sleep() for _MSC_VER. + * remote-array.c: #include <ctype.h> for isascii(). + * utils.c (notice_quit,pollquit): cleanup. _WIN32 -> _MSC_VER. + Fri Jul 25 16:48:18 1997 Jeffrey A Law (law@cygnus.com) * top.c (execute_command): Force cleanup of alloca areas. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index bec9aa8..48700af 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -620,6 +620,7 @@ init.c: $(OBS) $(TSOBS) tr ' ' '\012' | \ sed -e '/^Onindy.o/d' \ -e '/^nindy.o/d' \ + -e '/^mswin/d' \ -e '/ttyflush.o/d' \ -e '/xdr_ld.o/d' \ -e '/xdr_ptrace.o/d' \ diff --git a/gdb/mon960-rom.c b/gdb/mon960-rom.c index 0468a8b..0987802 100644 --- a/gdb/mon960-rom.c +++ b/gdb/mon960-rom.c @@ -28,18 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "symtab.h" #include "symfile.h" /* for generic_load */ -#if !defined (HAVE_TERMIOS) && !defined (HAVE_TERMIO) && !defined (HAVE_SGTTY) -#define HAVE_SGTTY -#endif - -#ifdef HAVE_SGTTY -#include <sys/ioctl.h> -#endif - -#include <sys/types.h> /* Needed by file.h on Sys V */ -#include <sys/file.h> -#include <signal.h> -#include <sys/stat.h> #define USE_GENERIC_LOAD diff --git a/gdb/remote-array.c b/gdb/remote-array.c index 42aa2da..4f832a4 100644 --- a/gdb/remote-array.c +++ b/gdb/remote-array.c @@ -33,6 +33,7 @@ #else #include <varargs.h> #endif +#include <ctype.h> #include <signal.h> #include <sys/types.h> #include "gdb_string.h" diff --git a/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c index b0976df..a2adef9 100644 --- a/gdb/ser-e7kpc.c +++ b/gdb/ser-e7kpc.c @@ -29,7 +29,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #define W32SUT_32 -#include <w32sut.h> +#include "mswin/w32sut.h" #endif #ifdef __GO32__ diff --git a/gdb/utils.c b/gdb/utils.c index 716f92e..a2699d6 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -607,97 +607,64 @@ quit () } -#if defined(__GO32__) || defined (_WIN32) +#if defined(__GO32__) -#ifndef _MSC_VER /* In the absence of signals, poll keyboard for a quit. Called from #define QUIT pollquit() in xm-go32.h. */ void -pollquit() +notice_quit() { if (kbhit ()) - { - int k = getkey (); - if (k == 1) { + switch (getkey ()) + { + case 1: quit_flag = 1; - quit(); - } - else if (k == 2) { - immediate_quit = 1; - quit (); + break; + case 2: + immediate_quit = 2; + break; + default: + /* We just ignore it */ + /* FIXME!! Don't think this actually works! */ + fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); + break; } - else - { - /* We just ignore it */ - /* FIXME!! Don't think this actually works! */ - fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); - } - } } -#else /* !_MSC_VER */ -/* This above code is not valid for wingdb unless - * getkey and kbhit were to be rewritten. +#elif defined(_MSC_VER) /* should test for wingdb instead? */ + +/* * Windows translates all keyboard and mouse events * into a message which is appended to the message * queue for the process. */ -void -pollquit() + +void notice_quit() { int k = win32pollquit(); if (k == 1) - { quit_flag = 1; - quit (); - } else if (k == 2) - { immediate_quit = 1; - quit (); - } } -#endif /* !_MSC_VER */ +#else /* !defined(__GO32__) && !defined(_MSC_VER) */ -#ifndef _MSC_VER void notice_quit() { - if (kbhit ()) - { - int k = getkey (); - if (k == 1) { - quit_flag = 1; - } - else if (k == 2) - { - immediate_quit = 1; - } - else - { - fprintf_unfiltered (gdb_stderr, "CTRL-A to quit, CTRL-B to quit harder\n"); - } - } + /* Done by signals */ } -#else /* !_MSC_VER */ -void notice_quit() -{ - int k = win32pollquit(); - if (k == 1) - quit_flag = 1; - else if (k == 2) - immediate_quit = 1; -} -#endif /* !_MSC_VER */ +#endif /* !defined(__GO32__) && !defined(_MSC_VER) */ -#else -void notice_quit() +void +pollquit() { - /* Done by signals */ + notice_quit (); + if (quit_flag || immediate_quit) + quit (); } -#endif /* defined(__GO32__) || defined(_WIN32) */ /* Control C comes here */ |