Rename ESC -> ESC_PARENS
A following patch will include common/preprocessor.h in some .c file that also includes readline.h, and that revealed a conflict -- ESC is defined by readline.h as well (actually readline's chardefs.h) with a completely unrelated meaning: #define ESC CTRL('[') Rename our version to avoid the conflict. gdb/ChangeLog: 2019-01-23 Pedro Alves <palves@redhat.com> * common/preprocessor.h (ESC): Rename to ... (ESC_PARENS): ... this. * common/valid-expr.h (CHECK_VALID_EXPR_1, CHECK_VALID_EXPR_2) (CHECK_VALID_EXPR_3, CHECK_VALID_EXPR_4): Adjust.
This commit is contained in:
parent
ae73e2e243
commit
cf08fb29f8
|
@ -1,3 +1,10 @@
|
|||
2019-01-23 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* common/preprocessor.h (ESC): Rename to ...
|
||||
(ESC_PARENS): ... this.
|
||||
* common/valid-expr.h (CHECK_VALID_EXPR_1, CHECK_VALID_EXPR_2)
|
||||
(CHECK_VALID_EXPR_3, CHECK_VALID_EXPR_4): Adjust.
|
||||
|
||||
2019-01-23 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* language.h (class scoped_switch_to_sym_language_if_auto):
|
||||
|
|
|
@ -30,6 +30,6 @@
|
|||
|
||||
/* Escape parens out. Useful if you need to pass an argument that
|
||||
includes commas to another macro. */
|
||||
#define ESC(...) __VA_ARGS__
|
||||
#define ESC_PARENS(...) __VA_ARGS__
|
||||
|
||||
#endif /* COMMON_PREPROC */
|
||||
|
|
|
@ -85,24 +85,24 @@
|
|||
another variant. */
|
||||
|
||||
#define CHECK_VALID_EXPR_1(T1, VALID, EXPR_TYPE, EXPR) \
|
||||
CHECK_VALID_EXPR_INT (ESC (typename T1), \
|
||||
ESC (T1), \
|
||||
CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1), \
|
||||
ESC_PARENS (T1), \
|
||||
VALID, EXPR_TYPE, EXPR)
|
||||
|
||||
#define CHECK_VALID_EXPR_2(T1, T2, VALID, EXPR_TYPE, EXPR) \
|
||||
CHECK_VALID_EXPR_INT (ESC (typename T1, typename T2), \
|
||||
ESC (T1, T2), \
|
||||
CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
|
||||
ESC_PARENS (T1, T2), \
|
||||
VALID, EXPR_TYPE, EXPR)
|
||||
|
||||
#define CHECK_VALID_EXPR_3(T1, T2, T3, VALID, EXPR_TYPE, EXPR) \
|
||||
CHECK_VALID_EXPR_INT (ESC (typename T1, typename T2, typename T3), \
|
||||
ESC (T1, T2, T3), \
|
||||
CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, typename T3), \
|
||||
ESC_PARENS (T1, T2, T3), \
|
||||
VALID, EXPR_TYPE, EXPR)
|
||||
|
||||
#define CHECK_VALID_EXPR_4(T1, T2, T3, T4, VALID, EXPR_TYPE, EXPR) \
|
||||
CHECK_VALID_EXPR_INT (ESC (typename T1, typename T2, \
|
||||
typename T3, typename T4), \
|
||||
ESC (T1, T2, T3, T4), \
|
||||
CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \
|
||||
typename T3, typename T4), \
|
||||
ESC_PARENS (T1, T2, T3, T4), \
|
||||
VALID, EXPR_TYPE, EXPR)
|
||||
|
||||
#endif /* COMMON_VALID_EXPR_H */
|
||||
|
|
Loading…
Reference in New Issue