cf08fb29f8
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.
35 lines
1.2 KiB
C
35 lines
1.2 KiB
C
/* Copyright (C) 2017-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMMON_PREPROC_H
|
|
#define COMMON_PREPROC_H
|
|
|
|
/* Generally useful preprocessor bits. */
|
|
|
|
/* Concatenate two tokens. */
|
|
#define CONCAT_1(a, b) a ## b
|
|
#define CONCAT(a, b) CONCAT_1 (a, b)
|
|
|
|
/* Stringification. */
|
|
#define STRINGIFY_1(x) #x
|
|
#define STRINGIFY(x) STRINGIFY_1 (x)
|
|
|
|
/* Escape parens out. Useful if you need to pass an argument that
|
|
includes commas to another macro. */
|
|
#define ESC_PARENS(...) __VA_ARGS__
|
|
|
|
#endif /* COMMON_PREPROC */
|