[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

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 07361746eb465edd3f3510e6b0e4e084cb91c5b4..bcbfa97a2be7d20e1f1d21aee406092af7dce368 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-31  Nathan Sidwell  <nathan@acm.org>
 
+       * 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 a9b4fb3973cf9a255f259236417106a9103ace07..345155b210a83b2b90c2648714882de71bd78d35 100644 (file)
--- 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