* inflow.h: Update copyright year. Remove #ifdef SHORT_PGRP code.

Callapse HAVE_TERMIO and HAVE_SGTTY.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a7b77fce82d3539f583fa8a52a49dec14d6fb7cc..80420fcdc5c6a577e430a1513850228b34ca3d1d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-26  Mark Kettenis  <kettenis@gnu.org>
 
+       * inflow.h: Update copyright year.  Remove #ifdef SHORT_PGRP code.
+       Callapse HAVE_TERMIO and HAVE_SGTTY.
+
        * dwarf2-frame.c (execute_cfa_program): Implement
        DW_CFA_GNU_window_save.
 

diff --git a/gdb/inflow.h b/gdb/inflow.h
index 1cbfa71b484471b1d91df752ee897477c5601827..017865ed2ce761381a3768d6de90c2df2b7e5b5b 100644 (file)
--- a/gdb/inflow.h
+++ b/gdb/inflow.h
@@ -1,6 +1,6 @@
 /* Low level interface to ptrace, for GDB when running under Unix.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -25,22 +25,11 @@
 #include "terminal.h"          /* For HAVE_TERMIOS et.al.  */
 
 #ifdef HAVE_TERMIOS
-#define PROCESS_GROUP_TYPE pid_t
+# define PROCESS_GROUP_TYPE pid_t
+#elif defined (HAVE_TERMIO) || defined (HAVE_SGTTY)
+# define PROCESS_GROUP_TYPE int
 #endif
 
-#ifdef HAVE_TERMIO
-#define PROCESS_GROUP_TYPE int
-#endif
-
-#ifdef HAVE_SGTTY
-#ifdef SHORT_PGRP
-/* This is only used for the ultra.  Does it have pid_t?  */
-#define PROCESS_GROUP_TYPE short
-#else
-#define PROCESS_GROUP_TYPE int
-#endif
-#endif /* sgtty */
-
 #ifdef PROCESS_GROUP_TYPE
 /* Process group for us and the inferior.  Saved and restored just like
    {our,inferior}_ttystate.  */
@@ -48,4 +37,4 @@ extern PROCESS_GROUP_TYPE our_process_group;
 extern PROCESS_GROUP_TYPE inferior_process_group;
 #endif
 
-#endif
+#endif /* inflow.h */