public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] ODR warning for "enum string_repr_result"
@ 2022-06-02 15:29 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-06-02 15:29 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cec000ad603ea768f5c1a6cf032770eb2d468337
commit cec000ad603ea768f5c1a6cf032770eb2d468337
Author: Tom Tromey <tromey@adacore.com>
Date: Wed May 18 09:55:00 2022 -0600
ODR warning for "enum string_repr_result"
"enum string_repr_result" is defined in multiple .c files, causing ODR
warnings. This patch renames the types.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
Diff:
---
gdb/guile/scm-pretty-print.c | 8 ++++----
gdb/python/py-prettyprint.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c
index 2bb63e849d1..e2bc19820d7 100644
--- a/gdb/guile/scm-pretty-print.c
+++ b/gdb/guile/scm-pretty-print.c
@@ -31,7 +31,7 @@
/* Return type of print_string_repr. */
-enum string_repr_result
+enum guile_string_repr_result
{
/* The string method returned None. */
STRING_REPR_NONE,
@@ -638,7 +638,7 @@ ppscm_print_exception_unless_memory_error (SCM exception,
/* Helper for gdbscm_apply_val_pretty_printer which calls to_string and
formats the result. */
-static enum string_repr_result
+static enum guile_string_repr_result
ppscm_print_string_repr (SCM printer, enum display_hint hint,
struct ui_file *stream, int recurse,
const struct value_print_options *options,
@@ -647,7 +647,7 @@ ppscm_print_string_repr (SCM printer, enum display_hint hint,
{
struct value *replacement = NULL;
SCM str_scm;
- enum string_repr_result result = STRING_REPR_ERROR;
+ enum guile_string_repr_result result = STRING_REPR_ERROR;
str_scm = ppscm_pretty_print_one_value (printer, &replacement,
gdbarch, language);
@@ -963,7 +963,7 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang,
SCM val_obj = SCM_BOOL_F;
enum display_hint hint;
enum ext_lang_rc result = EXT_LANG_RC_NOP;
- enum string_repr_result print_result;
+ enum guile_string_repr_result print_result;
if (value_lazy (value))
value_fetch_lazy (value);
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index c9bbd726412..a25a1b65944 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -29,7 +29,7 @@
/* Return type of print_string_repr. */
-enum string_repr_result
+enum gdbpy_string_repr_result
{
/* The string method returned None. */
string_repr_none,
@@ -273,7 +273,7 @@ print_stack_unless_memory_error (struct ui_file *stream)
/* Helper for gdbpy_apply_val_pretty_printer which calls to_string and
formats the result. */
-static enum string_repr_result
+static enum gdbpy_string_repr_result
print_string_repr (PyObject *printer, const char *hint,
struct ui_file *stream, int recurse,
const struct value_print_options *options,
@@ -281,7 +281,7 @@ print_string_repr (PyObject *printer, const char *hint,
struct gdbarch *gdbarch)
{
struct value *replacement = NULL;
- enum string_repr_result result = string_repr_ok;
+ enum gdbpy_string_repr_result result = string_repr_ok;
gdbpy_ref<> py_str = pretty_print_one_value (printer, &replacement);
if (py_str != NULL)
@@ -572,7 +572,7 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang,
{
struct type *type = value_type (value);
struct gdbarch *gdbarch = type->arch ();
- enum string_repr_result print_result;
+ enum gdbpy_string_repr_result print_result;
if (value_lazy (value))
value_fetch_lazy (value);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-02 15:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 15:29 [binutils-gdb] ODR warning for "enum string_repr_result" Tom Tromey
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).