[patch] s//struct serial/ for monitor.* and remote-utils.*

[Andrew Cagney <ac131313 at cygnus dot com>]

Just FYI,

The attached zaps a few more serial_t's.  As a side effect it fixes 
several dependencies in Makefile.in.

	Andrew
2001-07-10  Andrew Cagney  <ac131313@redhat.com>

	* remote-utils.h (struct serial): Declare as opaque.  Remove
	include of "serial.h".
	* Makefile.in (remote_utils_h): Update.

	* monitor.h (struct serial): Declare as opaque.  Remove include of
	"serial.h".
	(struct monitor_ops): Replace serial_t with `struct serial *'.
	* monitor.c (monitor_desc): Ditto.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.92
diff -p -r1.92 Makefile.in
*** Makefile.in	2001/07/08 20:11:12	1.92
--- Makefile.in	2001/07/10 20:59:54
*************** demangle_h =    $(INCLUDE_DIR)/demangle.
*** 559,565 ****
  obstack_h =     $(INCLUDE_DIR)/obstack.h
  
  dcache_h = dcache.h
! remote_utils_h = $(dcache_h) serial.h target.h remote-utils.h $(remote-sim_h)
  
  
  readline_headers = \
--- 559,565 ----
  obstack_h =     $(INCLUDE_DIR)/obstack.h
  
  dcache_h = dcache.h
! remote_utils_h =  remote-utils.h $(target_h)
  
  
  readline_headers = \
Index: monitor.c
===================================================================
RCS file: /cvs/src/src/gdb/monitor.c,v
retrieving revision 1.26
diff -p -r1.26 monitor.c
*** monitor.c	2001/06/28 20:03:10	1.26
--- monitor.c	2001/07/10 21:00:02
*************** static CORE_ADDR *breakaddr;
*** 119,125 ****
     that monitor_open knows that we don't have a file open when the
     program starts.  */
  
! static serial_t monitor_desc = NULL;
  
  /* Pointer to regexp pattern matching data */
  
--- 119,125 ----
     that monitor_open knows that we don't have a file open when the
     program starts.  */
  
! static struct serial *monitor_desc = NULL;
  
  /* Pointer to regexp pattern matching data */
  
Index: monitor.h
===================================================================
RCS file: /cvs/src/src/gdb/monitor.h,v
retrieving revision 1.6
diff -p -r1.6 monitor.h
*** monitor.h	2001/03/06 08:21:11	1.6
--- monitor.h	2001/07/10 21:00:02
***************
*** 21,27 ****
     Boston, MA 02111-1307, USA.
   */
  
! #include "serial.h"
  
  /* This structure describes the strings necessary to give small command
     sequences to the monitor, and parse the response.
--- 21,27 ----
     Boston, MA 02111-1307, USA.
   */
  
! struct serial;
  
  /* This structure describes the strings necessary to give small command
     sequences to the monitor, and parse the response.
*************** struct monitor_ops
*** 97,103 ****
      char *dump_registers;	/* Command to dump all regs at once */
      char *register_pattern;	/* Pattern that picks out register from reg dump */
      void (*supply_register) (char *name, int namelen, char *val, int vallen);
!     void (*load_routine) (serial_t desc, char *file,
  			  int hashmark);	/* Download routine */
      int (*dumpregs) (void);	/* routine to dump all registers */
      int (*continue_hook) (void);	/* Emit the continue command */
--- 97,103 ----
      char *dump_registers;	/* Command to dump all regs at once */
      char *register_pattern;	/* Pattern that picks out register from reg dump */
      void (*supply_register) (char *name, int namelen, char *val, int vallen);
!     void (*load_routine) (struct serial *desc, char *file,
  			  int hashmark);	/* Download routine */
      int (*dumpregs) (void);	/* routine to dump all registers */
      int (*continue_hook) (void);	/* Emit the continue command */
Index: remote-utils.h
===================================================================
RCS file: /cvs/src/src/gdb/remote-utils.h,v
retrieving revision 1.7
diff -p -r1.7 remote-utils.h
*** remote-utils.h	2001/03/06 08:21:13	1.7
--- remote-utils.h	2001/07/10 21:00:02
***************
*** 22,29 ****
  #ifndef REMOTE_UTILS_H
  #define REMOTE_UTILS_H
  
- #include "serial.h"
  #include "target.h"
  
  /* Stuff that should be shared (and handled consistently) among the various
     remote targets.  */
--- 22,29 ----
  #ifndef REMOTE_UTILS_H
  #define REMOTE_UTILS_H
  
  #include "target.h"
+ struct serial;
  
  /* Stuff that should be shared (and handled consistently) among the various
     remote targets.  */
*************** struct _sr_settings
*** 35,41 ****
      int retries;
  
      char *device;
!     serial_t desc;
  
    };
  
--- 35,41 ----
      int retries;
  
      char *device;
!     struct serial *desc;
  
    };