Allow BSD yacc and bison to compile pl code.

diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index 06a119ff9bbeea9ee4927892a75dc251b4dceff7..22f28c575e712c6e5c0a811579bb0903602dbf7b 100644 (file)
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *                       procedural language
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.6 1999/08/09 00:08:52 momjian Exp $
+ *    $Header: /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,8 +39,9 @@
 #include "stdio.h"
 #include "string.h"
 #include "plpgsql.h"
-#include "pl_scan.c"  /* BSD Yacc doesn't like it here.
-                                                It wants it after the %% */
+#ifdef YYBISON
+#include "pl_scan.c" /* GNU bison wants it here */
+#endif
 
 
 
@@ -1082,6 +1083,11 @@ lno              :
 
 %%
 
+#ifndef YYBISON
+#include "pl_scan.c" /* BSD yacc wants it here */
+#endif
+
+
 PLpgSQL_expr *
 plpgsql_read_expression (int until, char *s)
 {