diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-08-20 15:28:15 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-08-20 15:28:15 +0000 |
| commit | 7692e253ee0bdab40fb896991f9208112ebfff61 (patch) | |
| tree | d7d8e0dbf2fb099ed1f39632f6d6f65ebdbd43c4 /libcpp/include | |
| parent | e11b709d2107a504c185d75d7e1a2b0b2a2dc6fe (diff) | |
| download | gcc-7692e253ee0bdab40fb896991f9208112ebfff61.zip gcc-7692e253ee0bdab40fb896991f9208112ebfff61.tar.gz gcc-7692e253ee0bdab40fb896991f9208112ebfff61.tar.bz2 | |
[CPP PATCH] Fix warning & other cleanups.
https://gcc.gnu.org/ml/gcc-patches/2018-08/msg01162.html
* directives.c (do_undef): Use cpp_macro_p & cpp_builtin_macro_p.
* include/cpplib.h (enum cpp_macro_kind): Remove trailing comma.
(cpp_fun_like_macro_p): Make inline, define.
* macro.c (cpp_define_lazily): Use UCHAR_MAX.
(cpp_fun_like_macro_p): Delete.
From-SVN: r263666
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index d446fb1..b784e0f 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -674,7 +674,7 @@ struct cpp_dir enum cpp_macro_kind { cmk_macro, /* An ISO macro (token expansion). */ cmk_assert, /* An assertion. */ - cmk_traditional, /* A traditional macro (text expansion). */ + cmk_traditional /* A traditional macro (text expansion). */ }; /* Each macro definition is recorded in a cpp_macro structure. @@ -972,7 +972,10 @@ inline bool cpp_macro_p (const cpp_hashnode *node) return node->type == NT_MACRO; } /* Returns true if NODE is a function-like user macro. */ -extern bool cpp_fun_like_macro_p (cpp_hashnode *node); +inline bool cpp_fun_like_macro_p (cpp_hashnode *node) +{ + return cpp_user_macro_p (node) && node->value.macro->fun_like; +} extern const unsigned char *cpp_macro_definition (cpp_reader *, cpp_hashnode *); |