* [PATCH/committed] sim: rl78: rename open symbol to avoid collisions
@ 2021-05-23 21:40 Mike Frysinger
0 siblings, 0 replies; only message in thread
From: Mike Frysinger @ 2021-05-23 21:40 UTC (permalink / raw)
To: gdb-patches
If the header files define open(), make sure our local open var
doesn't shadow it.
---
sim/rl78/ChangeLog | 6 ++++++
sim/rl78/gdb-if.c | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index ecd9ed0fc76c..60102ee97a87 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-23 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>
* cpu.c, gdb-if.c, load.c, main.c, mem.c, rl78.c, trace.c: Replace
diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index a2414f9a3557..ee799657076e 100644
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -56,7 +56,7 @@ static struct sim_state the_minisim = {
"This is the sole rl78 minisim instance."
};
-static int open;
+static int is_open;
static struct host_callback_struct *host_callbacks;
@@ -69,7 +69,7 @@ sim_open (SIM_OPEN_KIND kind,
struct host_callback_struct *callback,
struct bfd *abfd, char * const *argv)
{
- if (open)
+ if (is_open)
fprintf (stderr, "rl78 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,
trace = 0;
sim_disasm_init (abfd);
- open = 1;
+ is_open = 1;
while (argv != NULL && *argv != NULL)
{
@@ -145,7 +145,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;
}
/* Open the program to run; print a message if the program cannot
--
2.31.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-23 21:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-23 21:40 [PATCH/committed] sim: rl78: rename open symbol to avoid collisions Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).