make yywrap work with c++ scanners as per sf bug report

1 files changed, 7 insertions, 1 deletions

diff --git a/main.c b/main.c
index 5d8a818..c4e7923 100644
--- a/main.c
+++ b/main.c
@@ -1571,7 +1571,9 @@ void readin ()
     }
 
 	if (!do_yywrap) {
-		outn ("\n#define yywrap(n) 1");
+		if (!C_plus_plus) {
+			outn ("\n#define yywrap(n) 1");
+		}
 		outn ("#define YY_SKIP_YYWRAP");
 	}
 
@@ -1644,6 +1646,10 @@ void readin ()
 	if (C_plus_plus) {
 		outn ("\n#include <FlexLexer.h>");
 
+ 		if (!do_yywrap) {
+			outn("\nint yyFlexLexer::yywrap() { return 1; }");
+		}
+
 		if (yyclass) {
 			outn ("int yyFlexLexer::yylex()");
 			outn ("\t{");