1 files changed, 5 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 4671a08..d042809 100644
--- a/src/main.c
+++ b/src/main.c
@@ -304,6 +304,8 @@ void check_options ()
 	if (C_plus_plus && bison_bridge_lval)
 		flexerror (_("bison bridge not supported for the C++ scanner."));
 
+	if(C_plus_plus)
+		buf_m4_define( &m4defs_buf, "M4_YY_CXX", NULL);
 
 	if (useecs) {		/* Set up doubly-linked equivalence classes. */
 
@@ -1663,6 +1665,9 @@ void readin ()
 	}
 	OUT_END_CODE ();
 
+	if(charset_enabled)
+		outn ("#define YY_CHARSET");
+
 	if (C_plus_plus) {
 		outn ("#define yytext_ptr yytext");