Hmm, it seems some versions of flex declare yytext as extern char[]

but others declare it as extern char *.  gcc complains (quite rightly too).
Worked around it by rearranging the order of inclusions so that we don't
have to explicitly declare yytext; this should work with either variant.
This commit is contained in:
Tom Lane 1999-03-21 01:07:07 +00:00
parent e4274d60a5
commit 1b8d9466fb
1 changed files with 4 additions and 7 deletions

View File

@ -4,7 +4,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.2 1999/01/28 11:48:30 wieck Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.3 1999/03/21 01:07:07 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -40,8 +40,9 @@
#include "string.h" #include "string.h"
#include "plpgsql.h" #include "plpgsql.h"
extern int yylineno; extern int yylineno; /* not always declared by lexer... */
extern char yytext[];
#include "pl_scan.c"
static PLpgSQL_expr *read_sqlstmt(int until, char *s, char *sqlstart); static PLpgSQL_expr *read_sqlstmt(int until, char *s, char *sqlstart);
static PLpgSQL_stmt *make_select_stmt(void); static PLpgSQL_stmt *make_select_stmt(void);
@ -1454,7 +1455,3 @@ make_tupret_expr(PLpgSQL_row *row)
plpgsql_dstring_free(&ds); plpgsql_dstring_free(&ds);
return expr; return expr;
} }
#include "pl_scan.c"