Sat Oct 28 23:51:48 1995 steve chamberlain <sac@slash.cygnus.com>

	* defs.h: Test on name __WIN32__ rather than WIN32.
	* inflow.c (new_tty): Likewise
	* terminal.h: Likewise.
	* utils.c (initialize_utils): Likewise.
	* win32-nat.c (child_create_inferiror): Print error code when failing.
	* config/i386/win32.mh (XM_CLIBS): Need -lkernel32.

5 files changed, 68 insertions, 19 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fff1da1..3b0fec1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Sat Oct 28 23:51:48 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* defs.h: Test on name __WIN32__ rather than WIN32.
+	* inflow.c (new_tty): Likewise
+	* terminal.h: Likewise.
+	* utils.c (initialize_utils): Likewise.
+	* win32-nat.c (child_create_inferiror): Print error code when failing.
+	* config/i386/win32.mh (XM_CLIBS): Need -lkernel32.
+	
 Sat Oct 28 04:52:36 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* symtab.h (enum address_class):  Add LOC_UNRESOLVED for
diff --git a/gdb/config/i386/win32.mh b/gdb/config/i386/win32.mh
index e1713a0..7b5f4e8 100644
--- a/gdb/config/i386/win32.mh
+++ b/gdb/config/i386/win32.mh
@@ -2,4 +2,5 @@ MH_CFLAGS=
 XM_FILE=xm-win32.h
 TERMCAP= 
 NATDEPFILES=win32-nat.o
+XM_CLIBS=-lkernel32
 
diff --git a/gdb/terminal.h b/gdb/terminal.h
index 4658c7a..6a32426 100644
--- a/gdb/terminal.h
+++ b/gdb/terminal.h
@@ -1,25 +1,58 @@
 /* Terminal interface definitions for GDB, the GNU Debugger.
-   Copyright (C) 1986, 1989, 1991 Free Software Foundation, Inc.
+   Copyright 1986, 1989, 1991, 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
-GDB is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-GDB is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GDB; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#if !defined (TERMINAL_H)
+#define TERMINAL_H 1
+
+
+/* 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 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 (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)
+#define HAVE_SGTTY
+#endif
+#endif
+#endif
+
+#if defined(HAVE_TERMIOS)
+#include <termios.h>
+#endif
+
+
+#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.  */
+   the system offers to make it look like that.  FIXME: serial.h and
+   ser-*.c deal with this in a much cleaner fashion; as soon as stuff
+   is converted to use them, can get rid of this crap.  */
 
 #ifdef HAVE_TERMIO
 
@@ -33,18 +66,24 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define TIOCSETP TCSETAF
 #define TERMINAL struct termio
 
-#ifdef NO_JOB_CONTROL
-# undef TIOCGPGRP
-# undef TIOCGPGRP
-#endif
-
-#else /* no termio */
+#else /* sgtty */
 
 #include <fcntl.h>
 #include <sgtty.h>
 #include <sys/ioctl.h>
 #define TERMINAL struct sgttyb
 
-#endif /* no termio */
+#endif /* sgtty */
+#endif
+
+extern void new_tty PARAMS ((void));
+
+/* Do we have job control?  Can be assumed to always be the same within
+   a given run of GDB.  In inflow.c.  */
+extern int job_control;
+
+/* Set the process group of the caller to its own pid, or do nothing if
+   we lack job control.  */
+extern int gdb_setpgid PARAMS ((void));
 
-extern void new_tty ();
+#endif	/* !defined (TERMINAL_H) */
diff --git a/gdb/utils.c b/gdb/utils.c
index 8bd01f8..97b6a9b 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#if !defined(__GO32__) && !defined(WIN32)
+#if !defined(__GO32__) && !defined(__WIN32__)
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <pwd.h>
@@ -1865,7 +1865,7 @@ initialize_utils ()
   
   /* These defaults will be used if we are unable to get the correct
      values from termcap.  */
-#if defined(__GO32__) || defined(WIN32)
+#if defined(__GO32__) || defined(__WIN32__)
   lines_per_page = ScreenRows();
   chars_per_line = ScreenCols();
 #else  
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 8bbffb3..feed5f5 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -473,7 +473,7 @@ child_create_inferior (exec_file, allargs, env)
 		       &si,
 		       &pi);
   if (!ret)
-    error ("Error creating process %s\n", exec_file);
+    error ("Error creating process %s, (error %d)\n", exec_file, GetLastError());
 
   exception_count = 0;
   event_count = 0;