From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 4 Jul 2012 10:04:07 +0000 (+0200)
Subject: tests: portability fixes.
X-Git-Tag: v2.6~34
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/1168b32295f6acde7a777d9519723fe276155b6b

tests: portability fixes.

Reported by Hydra.

* tests/headers.at (Several headers): Be sure to include config.h
in the files to compile.
---

diff --git a/tests/headers.at b/tests/headers.at
index 4660f97f..2eba7769 100644
--- 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)
 {