diff options
| -rw-r--r-- | contrib/cube/cubescan.l | 8 | ||||
| -rw-r--r-- | contrib/seg/segscan.l | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 3 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/scan.l | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l index 6fc51e81142..8367477adb7 100644 --- a/contrib/cube/cubescan.l +++ b/contrib/cube/cubescan.l @@ -3,18 +3,16 @@ ** A scanner for EMP-style numeric ranges */ -#define YYSTYPE char * -#define yylval cube_yylval - #include "postgres.h" -#include "cubeparse.h" #include "buffer.h" -/* flex screws a couple symbols when used with the -P otion; fix those */ +/* flex screws a couple symbols when used with the -P option; fix those */ #define YY_DECL int cube_yylex YY_PROTO(( void )); \ int cube_yylex YY_PROTO(( void )) +#define yylval cube_yylval + /* redefined YY_INPUT reads byte-wise from the memory area defined in buffer.c */ #undef YY_INPUT diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l index 271168d9f16..c0962eca8c5 100644 --- a/contrib/seg/segscan.l +++ b/contrib/seg/segscan.l @@ -5,11 +5,10 @@ #include "postgres.h" -#include "segparse.h" #include "buffer.h" -/* flex screws a couple symbols when used with the -P otion; fix those */ +/* flex screws a couple symbols when used with the -P option; fix those */ #define YY_DECL int seg_yylex YY_PROTO(( void )); \ int seg_yylex YY_PROTO(( void )) #define yylval seg_yylval diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 55758061f7a..65bd683b9fd 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.100 2002/10/21 13:09:31 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.101 2002/11/07 06:06:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,6 @@ #include <errno.h> #include "extern.h" -#include "preproc.h" extern YYSTYPE yylval; diff --git a/src/pl/plpgsql/src/scan.l b/src/pl/plpgsql/src/scan.l index 697be513930..7e89ca83098 100644 --- a/src/pl/plpgsql/src/scan.l +++ b/src/pl/plpgsql/src/scan.l @@ -4,7 +4,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.23 2002/09/12 00:24:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.24 2002/11/07 06:06:17 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -37,7 +37,6 @@ **********************************************************************/ #include "plpgsql.h" -#include "pl.tab.h" static char *plpgsql_source; |