sim: m32c: rename open symbol to avoid collisions

If the header files define open(), make sure our local open var
doesn't shadow it.

diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 591d8b9ddd1e11a7a3d8a1714e9d830fdc33168e..eec489f29dbdf32ca1769279ef37e91969863436 100644 (file)
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-28  Mike Frysinger  <vapier@gentoo.org>
+
+       * gdb-if.c (open): Rename to ...
+       (is_open): ... this.
+       (sim_open, sim_close): Rename open to is_open.
+
 2021-05-16  Mike Frysinger  <vapier@gentoo.org>
 
        * int.c, misc.c, opc2c.c, reg.c, srcdest.c: Include defs.h.

diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index b00d878f0bea2e34e0e812b504ba10100540b608..b154fe6d3148eb8b0dd1647918964a948186c9f5 100644 (file)
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -58,7 +58,7 @@ static struct sim_state the_minisim = {
   "This is the sole m32c minisim instance.  See libsim.a's global variables."
 };
 
-static int open;
+static int is_open;
 
 SIM_DESC
 sim_open (SIM_OPEN_KIND kind,
@@ -66,7 +66,7 @@ sim_open (SIM_OPEN_KIND kind,
          struct bfd *abfd, char * const *argv)
 {
   setbuf (stdout, 0);
-  if (open)
+  if (is_open)
     fprintf (stderr, "m32c minisim: re-opened sim\n");
 
   /* The 'run' interface doesn't use this function, so we don't care
@@ -88,7 +88,7 @@ sim_open (SIM_OPEN_KIND kind,
   init_mem ();
   init_regs ();
 
-  open = 1;
+  is_open = 1;
   return &the_minisim;
 }
 
@@ -107,7 +107,7 @@ sim_close (SIM_DESC sd, int quitting)
   /* Not much to do.  At least free up our memory.  */
   init_mem ();
 
-  open = 0;
+  is_open = 0;
 }
 
 static bfd *