From 9e77e83d300a8ecb97bcb9abc1bb78a7441cf519 Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Thu, 8 Aug 1996 02:50:22 +0000 Subject: * dwarf2read.c dwarfread.c exec.c infcmd.c infrun.c main.c mdebugread.c os9kread.c source.c top.c utils.c: Don't include param.h or sys/file.h (or unistd.h in some cases). * defs.h exec.c inflow.c remote-array.c remote-e7000.c sparcl-tdep.c terminal.h utils.c: Replace all occurances of __WIN32__, WINGDB, WIN32, etc... with _WIN32. * main.c: Remove #ifndef WINGDB around option processing. Fix bug with passing argc==0 and argv==NULL to getopt. * (main) Remove calls to access() before source_command. Let soure_command handle access errors. * maint.c (maintenance_dump_me): #ifdef out for _WIN32. * symtab.c (operator_chars): Make this global for wingdb. * top.c (disconnect): #ifdef out for _WIN32. * (source_command): If got an error and from_tty, then call print error, else just return quietly. * utils.c (fatal_dump_core): Can't kill ourselves under windows. Just exit. * (pollquit notice_quit): #ifdef out stuff that doesn't exist under windows. --- gdb/terminal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gdb/terminal.h') diff --git a/gdb/terminal.h b/gdb/terminal.h index 6a32426..7853d64 100644 --- a/gdb/terminal.h +++ b/gdb/terminal.h @@ -24,19 +24,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* If we're using autoconf, it will define HAVE_TERMIOS_H, HAVE_TERMIO_H and HAVE_SGTTY_H for us. One day we can rewrite ser-unix.c and inflow.c to inspect those names instead of - HAVE_TERMIOS, HAVE_TERMIO and the implicit HAVE_SGTYY (when neither + HAVE_TERMIOS, HAVE_TERMIO and the implicit HAVE_SGTTY (when neither HAVE_TERMIOS or HAVE_TERMIO is set). Until then, make sure that nothing has already defined the one of the names, and do the right thing. */ /* nothing works with go32, and the headers aren't complete */ -#if !defined (__GO32__) +#if !defined (__GO32__) && !defined (_WIN32) #if !defined (HAVE_TERMIOS) && !defined(HAVE_TERMIO) && !defined(HAVE_SGTTY) #if defined(HAVE_TERMIOS_H) #define HAVE_TERMIOS #elif defined(HAVE_TERMIO_H) #define HAVE_TERMIO -#elif defined(HAVE_SGTTY) +#elif defined(HAVE_SGTTY_H) #define HAVE_SGTTY #endif #endif @@ -46,8 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #endif - -#if !defined(__GO32__) && !defined(__WIN32__) && !defined (HAVE_TERMIOS) +#if !defined(__GO32__) && !defined(_WIN32) && !defined (HAVE_TERMIOS) /* Define a common set of macros -- BSD based -- and redefine whatever the system offers to make it look like that. FIXME: serial.h and -- cgit v1.1