Fixed test-c-cpp to actually use the C++ compiler for the test.

Fixed the bug that this exposed.

diff --git a/flex.skl b/flex.skl
index 523593a7dc6b295d5c21f398208c7d509e149fdb..59d42b2747826698f9e5a7c6ef4e6c0e77ab7567 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -520,7 +520,7 @@ struct yyguts_t
 %e
 
 %c
-static int yy_init_globals YY_PARAMS(( yyscan_t ));
+static int yy_init_globals YY_PARAMS(( YY_PROTO_ONLY_ARG ));
 %e
 
 /* This must go here because YYSTYPE and YYLSTYPE are included
@@ -1860,8 +1860,7 @@ void yyset_lloc YYFARGS1( YYLTYPE * ,yyllocp)
 #endif /* YY_REENTRANT_BISON_PURE */
 
 
-static int yy_init_globals( yyscanner )
-    yyscan_t yyscanner;
+static int yy_init_globals YYFARGS0(void)
     {
     /* Initialization is the same as for the non-reentrant scanner.
        This function is called once per scanner lifetime. */
@@ -1890,8 +1889,17 @@ static int yy_init_globals( yyscanner )
     }
 
 /* User-visible API */
+
+/* yylex_init is special because it creates the scanner itself, so it is
+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * That's why we explicitly handle the declaration, instead of using our macros.
+ */
+#ifndef YY_TRADITIONAL_FUNC_DEFS
+int yylex_init(yyscan_t* ptr_yy_globals)
+#else
 int yylex_init( ptr_yy_globals )
     yyscan_t* ptr_yy_globals;
+#endif
     {
     *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
     yy_init_globals ( *ptr_yy_globals );

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 4bd705420dacb89be95c836431b7a90e7475a466..32715f8128115a27e9687ee5e906a8b3965bd43d 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -45,4 +45,4 @@ test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CXX) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index f0ab41a99565a82f148853e57487136085bb60e5..9ccbff6beb5820d8aa1a6ef2d0bf2381c9b92e62 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -45,4 +45,4 @@ test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CXX) -c -o $@ $(INCLUDES) $<