]> granicus.if.org Git - flex/commitdiff
scanner: Use prefix when defining yywrap to avoid redefinition.
authorChristos Zoulas <christos@zoulas.com>
Sun, 22 Jan 2017 17:20:44 +0000 (18:20 +0100)
committerWill Estes <westes575@gmail.com>
Mon, 23 Jan 2017 16:35:19 +0000 (11:35 -0500)
Fixes regression introduced in v2.6.3.

src/main.c

index f70b1aa4afadce2907b2caa54adc119c9c22c3d3..83f66b04d7075dfa392dbb8b2a23f78979f6f5c2 100644 (file)
@@ -1586,9 +1586,9 @@ void readin (void)
        if (!do_yywrap) {
                if (!C_plus_plus) {
                         if (reentrant)
-                               outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
+                               out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix);
                         else
-                               outn ("\n#define yywrap() (/*CONSTCOND*/1)");
+                               out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix);
                }
                outn ("#define YY_SKIP_YYWRAP");
        }