Merge branch 'maint'

[bison.git] / data / c-like.m4

diff --git a/data/c-like.m4 b/data/c-like.m4
index c2abce7e1df55e63b97579642c3f79cf1bafdbc6..732d18d4c1c82d04a76ac4e3e06382ceffb6bba2 100644 (file)
--- a/data/c-like.m4
+++ b/data/c-like.m4
@@ -23,10 +23,9 @@
 # otherwise just VALUE.  Be sure to pass "(VALUE)" is VALUE is a
 # pointer.
 m4_define([b4_dollar_dollar_],
-[m4_if([$2], [[]],
-       [m4_ifval([$3], [($1.$3)],
-                 [$1])],
-       [($1.$2)])])
+[b4_symbol_value([$1],
+                 m4_if([$2], [[]],
+                       [[$3]], [[$2]]))])
 
 # b4_dollar_pushdef(VALUE-POINTER, DEFAULT-FIELD, LOCATION)
 # b4_dollar_popdef