Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/flex/dist/src avoid yywrap redefinition



details:   https://anonhg.NetBSD.org/src/rev/9cf9213bd8ea
branches:  trunk
changeset: 350038:9cf9213bd8ea
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 02 19:24:39 2017 +0000

description:
avoid yywrap redefinition

diffstat:

 external/bsd/flex/dist/src/main.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r fa6987ea4243 -r 9cf9213bd8ea external/bsd/flex/dist/src/main.c
--- a/external/bsd/flex/dist/src/main.c Mon Jan 02 18:41:18 2017 +0000
+++ b/external/bsd/flex/dist/src/main.c Mon Jan 02 19:24:39 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $        */
+/*     $NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $        */
 
 /* flex - tool to generate fast lexical analyzers */
 
@@ -33,7 +33,7 @@
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
 #include "flexdef.h"
-__RCSID("$NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $");
 
 
 #include "version.h"
@@ -1589,6 +1589,7 @@
 
        if (!do_yywrap) {
                if (!C_plus_plus) {
+                        outn ("\n#undef yywrap");
                         if (reentrant)
                                outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
                         else



Home | Main Index | Thread Index | Old Index