diff options
| author | Pedro Alves <palves@redhat.com> | 2019-01-23 18:58:28 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2019-01-23 18:58:28 +0000 |
| commit | cf08fb29f8c484a34c4babb015348b220f80a33b (patch) | |
| tree | 8ecd41fe1487c6916328cc8ff44e1002624a3a58 /gdb/common | |
| parent | ae73e2e2435cb706b18ba05734aee4137a271b3c (diff) | |
| download | gdb-cf08fb29f8c484a34c4babb015348b220f80a33b.zip gdb-cf08fb29f8c484a34c4babb015348b220f80a33b.tar.gz gdb-cf08fb29f8c484a34c4babb015348b220f80a33b.tar.bz2 | |
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.
Diffstat (limited to 'gdb/common')
| -rw-r--r-- | gdb/common/preprocessor.h | 2 | ||||
| -rw-r--r-- | gdb/common/valid-expr.h | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gdb/common/preprocessor.h b/gdb/common/preprocessor.h index 647568e..a7c33d0 100644 --- a/gdb/common/preprocessor.h +++ b/gdb/common/preprocessor.h @@ -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 */ diff --git a/gdb/common/valid-expr.h b/gdb/common/valid-expr.h index 9289448..603c76e 100644 --- a/gdb/common/valid-expr.h +++ b/gdb/common/valid-expr.h @@ -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 */ |