diff options
| -rw-r--r-- | src/backend/parser/Makefile.inc | 8 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 6 | ||||
| -rw-r--r-- | src/backend/regex/regcomp.c | 11 | ||||
| -rw-r--r-- | src/backend/regex/regerror.c | 4 | ||||
| -rw-r--r-- | src/backend/regex/regexec.c | 6 | ||||
| -rw-r--r-- | src/backend/regex/regfree.c | 6 |
6 files changed, 20 insertions, 21 deletions
diff --git a/src/backend/parser/Makefile.inc b/src/backend/parser/Makefile.inc index e5390dd891e..03489db1fcf 100644 --- a/src/backend/parser/Makefile.inc +++ b/src/backend/parser/Makefile.inc @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Attic/Makefile.inc,v 1.2 1996/07/23 02:23:32 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Attic/Makefile.inc,v 1.3 1996/09/20 08:34:10 scrappy Exp $ # #------------------------------------------------------------------------- @@ -17,9 +17,9 @@ VPATH:= $(VPATH):$(CURDIR)/parser PARSEYACCS= gram.c $(PARSEYACCS): gram.y - cd $(objdir); \ - $(YACC) $(YFLAGS) $<; \ - mv y.tab.c gram.c; \ + cd $(objdir) + $(YACC) $(YFLAGS) $< + mv y.tab.c gram.c mv y.tab.h parse.h $(objdir)/gram.o: gram.c diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 601329ffe9b..a9b69e9fff8 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.11 1996/08/28 22:50:21 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.12 1996/09/20 08:34:14 scrappy Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -122,7 +122,7 @@ static Node *makeA_Expr(int op, char *opname, Node *lexpr, Node *rexpr); %type <list> queryblock, relation_name_list, OptTableElementList, tableElementList, OptInherit, definition, - opt_with_func, opt_with, def_args, def_name_list, func_argtypes, + opt_with_func, def_args, def_name_list, func_argtypes, oper_argtypes, OptStmtList, OptStmtBlock, opt_column_list, columnList, exprList, sort_clause, sortby_list, index_params, name_list, from_clause, from_list, opt_array_bounds, nest_array_bounds, @@ -658,7 +658,7 @@ opt_portal_name: IN name { $$ = $2;} *****************************************************************************/ IndexStmt: CREATE INDEX index_name ON relation_name - access_method_clause '(' index_params ')' opt_with + access_method_clause '(' index_params ')' opt_with_func { /* should check that access_method is valid, etc ... but doesn't */ diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 186d6ecff86..88445cd50dc 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -47,13 +47,12 @@ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #include <ctype.h> #include <limits.h> #include <stdlib.h> -#include <regex.h> -#include "regex/utils.h" -#include "regex/regex2.h" - -#include "regex/cclass.h" -#include "regex/cname.h" +#include <regex/regex.h> +#include <regex/utils.h> +#include <regex/regex2.h> +#include <regex/cclass.h> +#include <regex/cname.h> /* * parse structure, passed up and down to avoid global variables and diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index 762398b51d9..dbfcc250613 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -47,9 +47,9 @@ static char sccsid[] = "@(#)regerror.c 8.4 (Berkeley) 3/20/94"; #include <ctype.h> #include <limits.h> #include <stdlib.h> -#include <regex.h> -#include "regex/utils.h" +#include <regex/regex.h> +#include <regex/utils.h> /* ========= begin header generated by ./mkh ========= */ #ifdef __cplusplus diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 65fda30ff23..a34f3f8daff 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -54,10 +54,10 @@ static char sccsid[] = "@(#)regexec.c 8.3 (Berkeley) 3/20/94"; #include <string.h> #include <limits.h> #include <ctype.h> -#include <regex.h> -#include "regex/utils.h" -#include "regex/regex2.h" +#include <regex/regex.h> +#include <regex/utils.h> +#include <regex/regex2.h> static int nope = 0; /* for use in asserts; shuts lint up */ diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c index 73d66079c29..9a7ff5cb5e1 100644 --- a/src/backend/regex/regfree.c +++ b/src/backend/regex/regfree.c @@ -44,10 +44,10 @@ static char sccsid[] = "@(#)regfree.c 8.3 (Berkeley) 3/20/94"; #include <sys/types.h> #include <stdio.h> #include <stdlib.h> -#include <regex.h> -#include "regex/utils.h" -#include "regex/regex2.h" +#include <regex/regex.h> +#include <regex/utils.h> +#include <regex/regex2.h> /* - regfree - free everything |