remove dependence on YYTEXT_POINTER which is not being defined when lex is

missing; explicitly request a %pointer instead

diff --git a/ginac/input_lexer.h b/ginac/input_lexer.h
index a01bc5d50be2dafa8c7208a9c0f2c3b5f88bd8ba..c3d154e3b3aebe087ad8d50c64422db6fa07c864 100644 (file)
--- a/ginac/input_lexer.h
+++ b/ginac/input_lexer.h
@@ -37,11 +37,7 @@ extern "C" {
 extern int ginac_yyerror(char *s);
 extern int ginac_yylex(void);
 extern void ginac_yyrestart(FILE *f);
-#if YYTEXT_POINTER
 extern char *ginac_yytext;
-#else
-extern char ginac_yytext[];
-#endif
 
 namespace GiNaC {
 

diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll
index 4be043a55738cd6787a5be0643ab96dda57838d7..9098b4f91125c3dccbcb3be5e507392f8384d756 100644 (file)
--- a/ginac/input_lexer.ll
+++ b/ginac/input_lexer.ll
@@ -26,6 +26,8 @@
  *  Definitions
  */
 
+%pointer
+
 %{
 #include <iostream>
 #include <string>

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index a7ec33dcdb49fe37483ddbeaf646a6161f92ba03..24d17a120563b00fa2d027b1a3509ee4cd662701 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -58,11 +58,7 @@ using namespace GiNaC;
 // lex functions/variables
 extern int yyerror(char *s);
 extern int yylex(void);
-#if YYTEXT_POINTER
 extern char *yytext;
-#else
-extern char yytext[];
-#endif
 extern FILE *yyin;
 
 // List of input files to be processed

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 15185d66a56b85c86813959c29f01f0871f4ef94..09765dfef127d4cecc84bcf7bf7e8f1d0555c8c1 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -26,6 +26,8 @@
  *  Definitions
  */
 
+%pointer
+
 %{
 #include "config.h"