diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.c | 26 | ||||
| -rwxr-xr-x | src/include/catalog/unused_oids | 4 |
2 files changed, 8 insertions, 22 deletions
diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c index 6b021e6d096..a41822a64ec 100644 --- a/src/backend/parser/gram.c +++ b/src/backend/parser/gram.c @@ -237,7 +237,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.54 1998/12/30 19:56:25 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.55 1998/12/31 20:09:44 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -4748,7 +4748,7 @@ static const short yycheck[] = { 3, -1, 212 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison.simple" +#line 3 "/usr/local/bison/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -4801,16 +4801,6 @@ void *alloca (); #endif /* not GNU C. */ #endif /* alloca not defined. */ -#ifdef __cplusplus -extern "C" { - void yyerror(char *); - int yylex(); -}; -#else - extern void yyerror(char *); - extern int yylex(); -#endif - /* This is the parser code that is written into each bison parser when the %semantic_parser declaration is not specified in the grammar. It was written by Richard Stallman by simplifying the hairy parser @@ -4907,13 +4897,9 @@ int yydebug; /* nonzero means print parse trace */ #define YYMAXDEPTH 10000 #endif -#ifndef YYPARSE_RETURN_TYPE -#define YYPARSE_RETURN_TYPE int -#endif - /* Prevent warning if -Wstrict-prototypes. */ #ifdef __GNUC__ -YYPARSE_RETURN_TYPE yyparse (void); +int yyparse (void); #endif #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ @@ -4955,7 +4941,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/share/bison.simple" +#line 196 "/usr/local/bison/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -4976,7 +4962,7 @@ __yy_memcpy (char *to, char *from, int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ -YYPARSE_RETURN_TYPE +int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { @@ -10948,7 +10934,7 @@ case 958: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/share/bison.simple" +#line 498 "/usr/local/bison/bison.simple" yyvsp -= yylen; yyssp -= yylen; diff --git a/src/include/catalog/unused_oids b/src/include/catalog/unused_oids index a30191dfa3d..14d72f0c173 100755 --- a/src/include/catalog/unused_oids +++ b/src/include/catalog/unused_oids @@ -1,7 +1,7 @@ #!/bin/sh # unused_oids # -# $Header: /cvsroot/pgsql/src/include/catalog/unused_oids,v 1.1 1997/03/15 06:03:08 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/include/catalog/unused_oids,v 1.2 1998/12/31 20:09:49 momjian Exp $ # # finds blocks of oids that have not already been claimed by # post_hackers for internal purposes. primarily useful for @@ -37,5 +37,5 @@ BEGIN { last = $1; } END { - print last + 1, "-"; + print last + 1, "-", 2^14-1; /* current BootstrapObjectIdData value */ }' |