From 43af5ef1cefc671f7baf3d0e33d46ab7f9a7d8b1 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 31 Oct 2018 14:46:39 +0000 Subject: [PATCH] [2/7] Preprocessor node access https://gcc.gnu.org/ml/gcc-patches/2018-10/msg02038.html * include/cpplib.h (HT_NODE): Don't cast NODE. (NODE_LEN, NODE_NAME): Use HT_NODE. From-SVN: r265687 --- libcpp/ChangeLog | 3 +++ libcpp/include/cpplib.h | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 07361746eb4..bcbfa97a2be 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,5 +1,8 @@ 2018-10-31 Nathan Sidwell + * include/cpplib.h (HT_NODE): Don't cast NODE. + (NODE_LEN, NODE_NAME): Use HT_NODE. + * directives.c (DIRECTIVE_TABLE): Drop historical frequency comments. * files.c (_cpp_stack_file): Fix indentation. diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index a9b4fb3973c..345155b210a 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -844,9 +844,9 @@ enum cpp_builtin_type }; #define CPP_HASHNODE(HNODE) ((cpp_hashnode *) (HNODE)) -#define HT_NODE(NODE) ((ht_identifier *) (NODE)) -#define NODE_LEN(NODE) HT_LEN (&(NODE)->ident) -#define NODE_NAME(NODE) HT_STR (&(NODE)->ident) +#define HT_NODE(NODE) (&(NODE)->ident) +#define NODE_LEN(NODE) HT_LEN (HT_NODE (NODE)) +#define NODE_NAME(NODE) HT_STR (HT_NODE (NODE)) /* The common part of an identifier node shared amongst all 3 C front ends. Also used to store CPP identifiers, which are a superset of -- 2.30.2