Module Name:    src
Committed By:   christos
Date:           Mon Jan  2 19:24:40 UTC 2017

Modified Files:
        src/external/bsd/flex/dist/src: main.c

Log Message:
avoid yywrap redefinition


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/flex/dist/src/main.c
diff -u src/external/bsd/flex/dist/src/main.c:1.3 src/external/bsd/flex/dist/src/main.c:1.4
--- src/external/bsd/flex/dist/src/main.c:1.3	Mon Jan  2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/main.c	Mon Jan  2 14:24:39 2017
@@ -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 @@ void readin (void)
 
 	if (!do_yywrap) {
 		if (!C_plus_plus) {
+			 outn ("\n#undef yywrap");
 			 if (reentrant)
 				outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
 			 else

Reply via email to