diff options
author | Tom de Vries <tdevries@suse.de> | 2023-08-14 18:32:29 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2023-08-14 18:32:29 +0200 |
commit | e72b937dddaf24d99ec1bf3beda4d8ecf3cd368c (patch) | |
tree | 5911a0ca086259e6be525b3e393cf8fe6a80747a /gdb/p-exp.y | |
parent | 9972aac27d5d664a29abc88acd3a84c1e72064c4 (diff) | |
download | gdb-e72b937dddaf24d99ec1bf3beda4d8ecf3cd368c.zip gdb-e72b937dddaf24d99ec1bf3beda4d8ecf3cd368c.tar.gz gdb-e72b937dddaf24d99ec1bf3beda4d8ecf3cd368c.tar.bz2 |
[gdb/build] Fix struct token odr violation
When building gdb with -O2 -flto I run into:
...
/data/vries/gdb/src/gdb/c-exp.y:2450:8: warning: type 'struct token' \
violates the C++ One Definition Rule [-Wodr]
struct token
^
/data/vries/gdb/src/gdb/d-exp.y:939:8: note: a different type is defined in \
another translation unit
struct token
^
...
Fix this by renaming to c_token and d_token.
Likewise in:
- fortran-exp.y, renaming to f_token,
- go-exp.y, renaming to go_token, and
- p-exp.y, renaming to p_token.
Tested on x86_64-linux.
Approved-By: Tom Tromey <tom@tromey.com>
PR build/22395
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
Diffstat (limited to 'gdb/p-exp.y')
-rw-r--r-- | gdb/p-exp.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/p-exp.y b/gdb/p-exp.y index b086bf7..2360a50 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -994,14 +994,14 @@ pop_current_type (void) } } -struct token +struct p_token { const char *oper; int token; enum exp_opcode opcode; }; -static const struct token tokentab3[] = +static const struct p_token tokentab3[] = { {"shr", RSH, OP_NULL}, {"shl", LSH, OP_NULL}, @@ -1014,7 +1014,7 @@ static const struct token tokentab3[] = {"xor", XOR, OP_NULL} }; -static const struct token tokentab2[] = +static const struct p_token tokentab2[] = { {"or", OR, OP_NULL}, {"<>", NOTEQUAL, OP_NULL}, |