From 80e61ea097e7a5c272e2d4f6f15a72a226779569 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 29 May 2021 12:03:27 -0400 Subject: [PATCH] sim: m32c: rename open symbol to avoid collisions If the header files define open(), make sure our local open var doesn't shadow it. --- sim/m32c/ChangeLog | 6 ++++++ sim/m32c/gdb-if.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 591d8b9ddd1..eec489f29db 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,9 @@ +2021-05-28 Mike Frysinger + + * gdb-if.c (open): Rename to ... + (is_open): ... this. + (sim_open, sim_close): Rename open to is_open. + 2021-05-16 Mike Frysinger * 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 b00d878f0be..b154fe6d314 100644 --- 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 * -- 2.30.2