From: Andres Freund <andres@anarazel.de>
Date: Mon, 28 Apr 2014 16:55:59 +0000 (+0200)
Subject: bdr: Adapt to postgresql upstream changes
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=bf73305686a90f3aaad77e40f6536d50cc92f86a;p=users%2Fandresfreund%2Fpostgres.git

bdr: Adapt to postgresql upstream changes
---

diff --git a/contrib/bdr/bdr.h b/contrib/bdr/bdr.h
index 2bdfe8a19f..2599a9f0fb 100644
--- a/contrib/bdr/bdr.h
+++ b/contrib/bdr/bdr.h
@@ -170,8 +170,8 @@ extern int  bdr_node_count(void);
 extern void bdr_sequencer_wakeup(void);
 extern void bdr_schedule_eoxact_sequencer_wakeup(void);
 
-extern void bdr_sequence_alloc(PG_FUNCTION_ARGS);
-extern void bdr_sequence_setval(PG_FUNCTION_ARGS);
+extern Datum bdr_sequence_alloc(PG_FUNCTION_ARGS);
+extern Datum bdr_sequence_setval(PG_FUNCTION_ARGS);
 extern Datum bdr_sequence_options(PG_FUNCTION_ARGS);
 
 /* statistic functions */
diff --git a/contrib/bdr/bdr_apply.c b/contrib/bdr/bdr_apply.c
index 1dfdd951c7..4874eed315 100644
--- a/contrib/bdr/bdr_apply.c
+++ b/contrib/bdr/bdr_apply.c
@@ -1683,7 +1683,7 @@ retry:
 
 		if (TransactionIdIsValid(xwait))
 		{
-			XactLockTableWait(xwait);
+			XactLockTableWait(xwait, NULL, NULL, XLTW_None);
 			goto retry;
 		}
 	}
diff --git a/contrib/bdr/bdr_seq.c b/contrib/bdr/bdr_seq.c
index 7f4246ab66..26cb1fea64 100644
--- a/contrib/bdr/bdr_seq.c
+++ b/contrib/bdr/bdr_seq.c
@@ -1037,7 +1037,7 @@ bdr_sequencer_fill_sequences(void)
 #define SEQ_LOG_VALS	32
 
 PG_FUNCTION_INFO_V1(bdr_sequence_alloc);
-void
+Datum
 bdr_sequence_alloc(PG_FUNCTION_ARGS)
 {
 	Relation	seqrel = (Relation) PG_GETARG_POINTER(0);
@@ -1182,10 +1182,12 @@ bdr_sequence_alloc(PG_FUNCTION_ARGS)
 
 	/* schedule wakeup as soon as other xacts can see the seuqence */
 	bdr_schedule_eoxact_sequencer_wakeup();
+
+	PG_RETURN_VOID();
 }
 
 PG_FUNCTION_INFO_V1(bdr_sequence_setval);
-void
+Datum
 bdr_sequence_setval(PG_FUNCTION_ARGS)
 {
 	Relation	seqrel = (Relation) PG_GETARG_POINTER(0);
@@ -1212,6 +1214,8 @@ bdr_sequence_setval(PG_FUNCTION_ARGS)
 
 	/* schedule wakeup as soon as other xacts can see the seuqence */
 	bdr_schedule_eoxact_sequencer_wakeup();
+
+	PG_RETURN_VOID();
 }
 
 PG_FUNCTION_INFO_V1(bdr_sequence_options);
@@ -1230,4 +1234,6 @@ bdr_sequence_options(PG_FUNCTION_ARGS)
 
 	/* schedule wakeup as soon as other xacts can see the seuqence */
 	bdr_schedule_eoxact_sequencer_wakeup();
+
+	PG_RETURN_VOID();
 }