diff options
Diffstat (limited to 'gdb/ui-out.h')
| -rw-r--r-- | gdb/ui-out.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 5c96a78..c3ef8a5 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -77,8 +77,11 @@ enum ui_out_type /* The possible kinds of fields. */ enum class field_kind { - SIGNED, - STRING, + /* "FIELD_STRING" needs has a funny name to avoid clashes with + tokens named "STRING". See PR build/25250. FIELD_SIGNED is + given a similar name for consistency. */ + FIELD_SIGNED, + FIELD_STRING, }; /* The base type of all fields that can be emitted using %pF. */ @@ -105,7 +108,7 @@ signed_field (const char *name, LONGEST val, signed_field_s &&tmp = {}) { tmp.name = name; - tmp.kind = field_kind::SIGNED; + tmp.kind = field_kind::FIELD_SIGNED; tmp.val = val; return &tmp; } @@ -126,7 +129,7 @@ string_field (const char *name, const char *str, string_field_s &&tmp = {}) { tmp.name = name; - tmp.kind = field_kind::STRING; + tmp.kind = field_kind::FIELD_STRING; tmp.str = str; return &tmp; } |