* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ecfed22..81098a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2001-07-10  Daniel Jacobowitz  <drow@mvista.com>
 
        * mips-linux-tdep.c: New file.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 2491e5d..f943363 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -559,7 +559,7 @@ demangle_h =    $(INCLUDE_DIR)/demangle.h
 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)
+remote_utils_h =  remote-utils.h $(target_h)
 
 
 readline_headers = \

diff --git a/gdb/monitor.c b/gdb/monitor.c
index 1174dd9..6e601b0 100644 (file)
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -119,7 +119,7 @@ static CORE_ADDR *breakaddr;
    that monitor_open knows that we don't have a file open when the
    program starts.  */
 
-static serial_t monitor_desc = NULL;
+static struct serial *monitor_desc = NULL;
 
 /* Pointer to regexp pattern matching data */
 

diff --git a/gdb/monitor.h b/gdb/monitor.h
index b522bcb..afdc3b2 100644 (file)
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.
  */
 
-#include "serial.h"
+struct serial;
 
 /* This structure describes the strings necessary to give small command
    sequences to the monitor, and parse the response.
@@ -97,7 +97,7 @@ struct monitor_ops
     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,
+    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 */

diff --git a/gdb/remote-utils.h b/gdb/remote-utils.h
index 568ea08..3ca3bb4 100644 (file)
--- a/gdb/remote-utils.h
+++ b/gdb/remote-utils.h
@@ -22,8 +22,8 @@
 #ifndef REMOTE_UTILS_H
 #define REMOTE_UTILS_H
 
-#include "serial.h"
 #include "target.h"
+struct serial;
 
 /* Stuff that should be shared (and handled consistently) among the various
    remote targets.  */
@@ -35,7 +35,7 @@ struct _sr_settings
     int retries;
 
     char *device;
-    serial_t desc;
+    struct serial *desc;
 
   };