X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/86b08b49b3b1b9fc27a3c64d8421a6f30c12d942..32288c8cbd309b29dff45e81d78374a5eb9c006e:/src/flex-scanner.h

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index f27938dc..c1e07eae 100644
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -34,7 +34,7 @@
                        && Subminor < YY_FLEX_SUBMINOR_VERSION))))))
 
 /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used.  */
-# if ! FLEX_VERSION_GT (2, 5, 31)
+#if ! FLEX_VERSION_GT (2, 5, 31)
 int   FLEX_PREFIX (get_lineno) (void);
 FILE *FLEX_PREFIX (get_in) (void);
 FILE *FLEX_PREFIX (get_out) (void);
@@ -82,16 +82,13 @@ int   FLEX_PREFIX (lex_destroy) (void);
 
 static struct obstack obstack_for_string;
 
-#define STRING_GROW   \
+# define STRING_GROW                                    \
   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)
+# define STRING_FINISH                                  \
+  (last_string = obstack_finish0 (&obstack_for_string))
 
-#define STRING_FREE \
+# define STRING_FREE                                    \
   obstack_free (&obstack_for_string, last_string)
 
 #endif