mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-02-01 22:11:30 +01:00
28 lines
858 B
Diff
28 lines
858 B
Diff
From f5d87f1a26f4a5c3402497008ae10e9a1345d327 Mon Sep 17 00:00:00 2001
|
|
From: Christos Zoulas <christos@zoulas.com>
|
|
Date: Sun, 22 Jan 2017 18:20:44 +0100
|
|
Subject: [PATCH] scanner: Use prefix when defining yywrap to avoid
|
|
redefinition.
|
|
|
|
Fixes regression introduced in v2.6.3.
|
|
---
|
|
src/main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main.c b/src/main.c
|
|
index f70b1aa..83f66b0 100644
|
|
--- a/src/main.c
|
|
+++ b/src/main.c
|
|
@@ -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");
|
|
}
|