Merge remote-tracking branch 'origin/maint'

[bison.git] / src / flex-scanner.h

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index cf2b6b9eb8ec78c1a1ac30f181aa1d6ecb630833..c1e07eae0b2e67b8bded18ad7fad25779454ff28 100644 (file)
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -86,10 +86,7 @@ static struct obstack obstack_for_string;
   obstack_grow (&obstack_for_string, yytext, yyleng)
 
 # define STRING_FINISH                                  \
   obstack_grow (&obstack_for_string, yytext, yyleng)
 
 # define STRING_FINISH                                  \

-  do {                                                  \
-    obstack_1grow (&obstack_for_string, '\0');          \
-    last_string = obstack_finish (&obstack_for_string); \
-  } while (0)
+  (last_string = obstack_finish0 (&obstack_for_string))

 
 # define STRING_FREE                                    \
   obstack_free (&obstack_for_string, last_string)
 
 # define STRING_FREE                                    \
   obstack_free (&obstack_for_string, last_string)