* i386nbsd-nat.c (i386nbsd_supply_pcb): Cast to 'gdb_byte *' in

[deliverable/binutils-gdb.git] / gdb / remote-utils.h

diff --git a/gdb/remote-utils.h b/gdb/remote-utils.h
index 9f57068392952221184ba84060e59de19e66cfb9..daadcb90a7cfaacc54299f6c22ba814f704555bb 100644 (file)
--- a/gdb/remote-utils.h
+++ b/gdb/remote-utils.h
@@ -1,6 +1,6 @@
 /* Generic support for remote debugging interfaces.
 
-   Copyright 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,8 +22,10 @@
 #ifndef REMOTE_UTILS_H
 #define REMOTE_UTILS_H
 
-#include "serial.h"
+struct target_ops;
+
 #include "target.h"
+struct serial;
 
 /* Stuff that should be shared (and handled consistently) among the various
    remote targets.  */
@@ -35,7 +37,7 @@ struct _sr_settings
     int retries;
 
     char *device;
-    serial_t desc;
+    struct serial *desc;
 
   };
 
@@ -53,7 +55,7 @@ extern struct _sr_settings sr_settings;
 #define sr_get_device()                        (sr_settings.device)
 #define sr_set_device(newval) \
 { \
-    if (sr_settings.device) free(sr_settings.device); \
+    if (sr_settings.device) xfree (sr_settings.device); \
     sr_settings.device = (newval); \
 }
 
@@ -68,7 +70,7 @@ extern struct _sr_settings sr_settings;
 #define sr_is_open()                   (sr_settings.desc != NULL)
 
 #define sr_check_open()        { if (!sr_is_open()) \
-                                   error ("Remote device not open"); }
+                                   error (_("Remote device not open")); }
 
 struct gr_settings
   {