Make all our flex and bison files use %option prefix or %name-prefix

(respectively) to rename yylex and related symbols.  Some were doing
it this way already, while others used not-too-reliable sed hacks in
the Makefiles.  It's all nice and consistent now.

1 files changed, 4 insertions, 4 deletions

diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y
index 8a3b0b0160..d4d739c621 100644
--- a/contrib/seg/segparse.y
+++ b/contrib/seg/segparse.y
@@ -9,14 +9,12 @@
 #include "utils/builtins.h"
 #include "segdata.h"
 
-#undef yylex                  /* failure to redefine yylex will result in calling the */
-#define yylex seg_yylex       /* wrong scanner when running inside postgres backend  */
+  extern int seg_yylex(void);
 
-  extern int yylex(void);     /* defined as seg_yylex in segscan.l */
   extern int significant_digits( char *str );    /* defined in seg.c */
   
   void seg_yyerror(const char *message);
-  int seg_yyparse( void *result );
+  int seg_yyparse(void *result);
 
   float seg_atof( char *value );
 
@@ -32,6 +30,8 @@
 %}
 
 /* BISON Declarations */
+%name-prefix="seg_yy"
+
 %union {
   struct BND {
     float val;