Protect nat/gdb_thread_db.h against multiple inclusion.

[deliverable/binutils-gdb.git] / gdb / remote-m32r-sdi.c

diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c
index f7ea0b85c924f6fe90f73d88f4faa7dd196ef2c4..2597f6d87168ca288bf5ff7499fa28aff87c0d68 100644 (file)
--- a/gdb/remote-m32r-sdi.c
+++ b/gdb/remote-m32r-sdi.c
@@ -362,7 +362,8 @@ m32r_open (const char *args, int from_tty)
 {
   struct hostent *host_ent;
   struct sockaddr_in server_addr;
-  char *port_str, hostname[256];
+  char hostname[256];
+  const char *port_str;
   int port;
   int i, n;
   int yes = 1;
@@ -1423,7 +1424,8 @@ m32r_stop (struct target_ops *self, ptid_t ptid)
 
 static int
 m32r_can_use_hw_watchpoint (struct target_ops *self,
-                           int type, int cnt, int othertype)
+                           enum bptype type,
+                           int cnt, int othertype)
 {
   return sdi_desc != NULL && cnt < max_access_breaks;
 }
@@ -1434,7 +1436,7 @@ m32r_can_use_hw_watchpoint (struct target_ops *self,
 
 static int
 m32r_insert_watchpoint (struct target_ops *self,
-                       CORE_ADDR addr, int len, int type,
+                       CORE_ADDR addr, int len, enum target_hw_bp_type type,
                        struct expression *cond)
 {
   int i;
@@ -1459,9 +1461,8 @@ m32r_insert_watchpoint (struct target_ops *self,
 }
 
 static int
-m32r_remove_watchpoint (struct target_ops *self,
-                       CORE_ADDR addr, int len, int type,
-                       struct expression *cond)
+m32r_remove_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
+                       enum target_hw_bp_type type, struct expression *cond)
 {
   int i;