Index: gram.y
===================================================================
RCS file: /usr/local/cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v
retrieving revision 1.4
retrieving revision 1.7
diff -c -r1.4 -r1.7
*** gram.y	1999/03/21 02:27:47	1.4
--- gram.y	1999/08/16 19:57:21	1.7
***************
*** 4,10 ****
   *			  procedural language
   *
   * IDENTIFICATION
!  *    $Header: /usr/local/cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.4 1999/03/21 02:27:47 tgl Exp $
   *
   *    This software is copyrighted by Jan Wieck - Hamburg.
   *
--- 4,10 ----
   *			  procedural language
   *
   * IDENTIFICATION
!  *    $Header: /usr/local/cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.7 1999/08/16 19:57:21 momjian Exp $
   *
   *    This software is copyrighted by Jan Wieck - Hamburg.
   *
***************
*** 39,47 ****
  #include "stdio.h"
  #include "string.h"
  #include "plpgsql.h"
  
- #include "pl_scan.c"
  
  static	PLpgSQL_expr	*read_sqlstmt(int until, char *s, char *sqlstart);
  static	PLpgSQL_stmt	*make_select_stmt(void);
  static	PLpgSQL_expr	*make_tupret_expr(PLpgSQL_row *row);
--- 39,50 ----
  #include "stdio.h"
  #include "string.h"
  #include "plpgsql.h"
+ #ifdef YYBISON
+ #include "pl_scan.c" /* GNU bison wants it here */
+ #endif
  
  
+ 
  static	PLpgSQL_expr	*read_sqlstmt(int until, char *s, char *sqlstart);
  static	PLpgSQL_stmt	*make_select_stmt(void);
  static	PLpgSQL_expr	*make_tupret_expr(PLpgSQL_row *row);
***************
*** 1079,1084 ****
--- 1082,1092 ----
  		;
  
  %%
+ 
+ #ifndef YYBISON
+ #include "pl_scan.c" /* BSD yacc wants it here */
+ #endif
+ 
  
  PLpgSQL_expr *
  plpgsql_read_expression (int until, char *s)