Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Rename ESC -> ESC_PARENS

Browse Source 
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:
Pedro Alves
2019-01-23 18:58:28 +00:00
parent ae73e2e243
commit cf08fb29f8
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@@ -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> 2019-01-23 Tom Tromey <tom@tromey.com>
* language.h (class scoped_switch_to_sym_language_if_auto): * language.h (class scoped_switch_to_sym_language_if_auto):

2
gdb/common/preprocessor.h
View File

@@ -30,6 +30,6 @@
/* Escape parens out. Useful if you need to pass an argument that /* Escape parens out. Useful if you need to pass an argument that
includes commas to another macro. */ includes commas to another macro. */
#define ESC(...) __VA_ARGS__ #define ESC_PARENS(...) __VA_ARGS__
#endif /* COMMON_PREPROC */ #endif /* COMMON_PREPROC */

16
gdb/common/valid-expr.h
View File

@@ -85,24 +85,24 @@
another variant. */ another variant. */
#define CHECK_VALID_EXPR_1(T1, VALID, EXPR_TYPE, EXPR) \ #define CHECK_VALID_EXPR_1(T1, VALID, EXPR_TYPE, EXPR) \
CHECK_VALID_EXPR_INT (ESC (typename T1), \ CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1), \
ESC (T1), \ ESC_PARENS (T1), \
VALID, EXPR_TYPE, EXPR) VALID, EXPR_TYPE, EXPR)
#define CHECK_VALID_EXPR_2(T1, T2, VALID, EXPR_TYPE, EXPR) \ #define CHECK_VALID_EXPR_2(T1, T2, VALID, EXPR_TYPE, EXPR) \
CHECK_VALID_EXPR_INT (ESC (typename T1, typename T2), \ CHECK_VALID_EXPR_INT (ESC_PARENS(typename T1, typename T2), \
ESC (T1, T2), \ ESC_PARENS (T1, T2), \
VALID, EXPR_TYPE, EXPR) VALID, EXPR_TYPE, EXPR)
#define CHECK_VALID_EXPR_3(T1, T2, T3, 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), \ CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, typename T3), \
ESC (T1, T2, T3), \ ESC_PARENS (T1, T2, T3), \
VALID, EXPR_TYPE, EXPR) VALID, EXPR_TYPE, EXPR)
#define CHECK_VALID_EXPR_4(T1, T2, T3, T4, 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, \ CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \
typename T3, typename T4), \ typename T3, typename T4), \
ESC (T1, T2, T3, T4), \ ESC_PARENS (T1, T2, T3, T4), \
VALID, EXPR_TYPE, EXPR) VALID, EXPR_TYPE, EXPR)
#endif /* COMMON_VALID_EXPR_H */ #endif /* COMMON_VALID_EXPR_H */