Fix 9.6 build

knizhnik · knizhnik · commit 3048bdce35fe · 2017-10-29T17:42:25.000+03:00
diff --git a/Makefile b/Makefile
@@ -2,11 +2,14 @@
 
 MODULE_big = vops
 OBJS = vops.o vops_fdw.o deparse.o
+PGFILEDESC = "VOPS - vectorized operations for PostgreSQL"
+
+PG_CPPFLAGS = -I$(libpq_srcdir)
+SHLIB_LINK = $(libpq)
 
 EXTENSION = vops
 DATA = vops--1.0.sql
-PGFILEDESC = "vops - vectorized operations"
-CUSTOM_COPT = -O0
+#CUSTOM_COPT = -O0
 
 REGRESS = test
 
diff --git a/vops_fdw.c b/vops_fdw.c
@@ -805,7 +805,7 @@ postgresReScanForeignScan(ForeignScanState *node)
 		{
 			ExprState  *expr_state = (ExprState *) lfirst(lc);
 			/* Evaluate the parameter expression */
-#if PG_VERSION_NUM<90602
+#if PG_VERSION_NUM<100000
 			ExprDoneCond isDone;
 			values[i] = ExecEvalExpr(expr_state, econtext, &nulls[i], &isDone);
 #else

Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ postgresReScanForeignScan(ForeignScanState *node)`
`805`	`805`	`{`
`806`	`806`	`ExprState expr_state = (ExprState ) lfirst(lc);`
`807`	`807`	`/* Evaluate the parameter expression */`
`808`		`-#if PG_VERSION_NUM<90602`
	`808`	`+#if PG_VERSION_NUM<100000`
`809`	`809`	`ExprDoneCond isDone;`
`810`	`810`	`values[i] = ExecEvalExpr(expr_state, econtext, &nulls[i], &isDone);`
`811`	`811`	`#else`