summaryrefslogtreecommitdiff
path: root/contrib/cube/cube.c
diff options
context:
space:
mode:
authorTom Lane2013-07-29 14:42:44 +0000
committerTom Lane2013-07-29 14:42:44 +0000
commit9822dc38e193f5f9e6f088e6566cfcb1dba49db2 (patch)
treeb9f293f8c76544ec7e460c08288594861acc8314 /contrib/cube/cube.c
parent8714465f0f5ca54b6ad8b1fc8320fad6b8e9e2aa (diff)
Fix contrib/cube and contrib/seg to build with bison 3.0.
These modules used the YYPARSE_PARAM macro, which has been deprecated by the bison folk since 1.875, and which they finally removed in 3.0. Adjust the code to use the replacement facility, %parse-param, which is a much better solution anyway since it allows specification of the type of the extra parser parameter. We can thus get rid of a lot of unsightly casting. Back-patch to all active branches, since somebody might try to build a back branch with up-to-date tools.
Diffstat (limited to 'contrib/cube/cube.c')
-rw-r--r--contrib/cube/cube.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index 1d119ddbb50..37cbfdd20b8 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -26,8 +26,8 @@ PG_MODULE_MAGIC;
#define ARRPTR(x) ( (double *) ARR_DATA_PTR(x) )
#define ARRNELEMS(x) ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
-extern int cube_yyparse();
-extern void cube_yyerror(const char *message);
+extern int cube_yyparse(NDBOX **result);
+extern void cube_yyerror(NDBOX **result, const char *message);
extern void cube_scanner_init(const char *str);
extern void cube_scanner_finish(void);
@@ -158,12 +158,12 @@ Datum
cube_in(PG_FUNCTION_ARGS)
{
char *str = PG_GETARG_CSTRING(0);
- void *result;
+ NDBOX *result;
cube_scanner_init(str);
if (cube_yyparse(&result) != 0)
- cube_yyerror("bogus input");
+ cube_yyerror(&result, "bogus input");
cube_scanner_finish();