tests: portability fixes.

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 4660f97fe228f410152efef25006f92ae692aeb4..2eba77695e82ce087f86c037b13de49a3c513e20 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -130,7 +130,7 @@ AT_SETUP([Several parsers])
 # the header (but YYDEBUG and YYPARSE_PARAM).
 m4_define([AT_DATA_GRAMMAR_SEVERAL],
 [AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2])
-AT_DATA_GRAMMAR([AT_SKEL_CC_IF([$1.yy], [$1.y])],
+AT_DATA_GRAMMAR([$1.AT_SKEL_CC_IF([yy], [y])],
 [[%define api.prefix "$1_"
 $2
 %union
@@ -166,8 +166,8 @@ AT_BISON_OPTION_POPDEFS
 ])
 
 AT_DATA([main.cc],
-[[#define ECHO(S) std::cerr << #S": " << S << std::endl;
-extern "C"
+[AT_DATA_SOURCE_PROLOGUE
+[extern "C"
 {
   #include "x1.h"
   #include "x2.h"
@@ -177,6 +177,8 @@ extern "C"
 #include "x5.hh"
 //#include "x6.hh"
 
+#define ECHO(S) std::cerr << #S": " << S << std::endl;
+
 int
 main (void)
 {