Fix UDR after BDRLockType introduction in 10b331fea
authorCraig Ringer <craig@2ndquadrant.com>
Fri, 15 May 2015 09:18:47 +0000 (17:18 +0800)
committerCraig Ringer <craig@2ndquadrant.com>
Fri, 15 May 2015 09:27:23 +0000 (17:27 +0800)
bdr_locks.c

index 2b74fb95c5b03a7a4acae244c045be8bc012475b..5d9e6b17d4c6818bc5ba63732f7eadf0ae94f8d1 100644 (file)
 #include "utils/fmgroids.h"
 #include "utils/snapmgr.h"
 
+#endif
+
+/* GUCs */
+bool bdr_permit_ddl_locking = false;
+int bdr_ddl_grace_timeout = 10000;
+
+
+#ifdef BUILDING_BDR
+
 typedef struct BDRLockWaiter {
    PGPROC     *proc;
    slist_node  node;
@@ -158,8 +167,8 @@ static BDRLockType bdr_lock_name_to_type(const char *lock_type);
 static void bdr_request_replay_confirmation(void);
 static void bdr_send_confirm_lock(void);
 
-void bdr_locks_addwaiter(PGPROC *proc);
-void bdr_locks_on_unlock(void);
+static void bdr_locks_addwaiter(PGPROC *proc);
+static void bdr_locks_on_unlock(void);
 
 static BdrLocksCtl *bdr_locks_ctl;
 
@@ -171,10 +180,6 @@ static BdrLocksDBState *bdr_my_locks_database = NULL;
 
 static bool this_xact_acquired_lock = false;
 
-/* GUCs */
-bool bdr_permit_ddl_locking = false;
-int bdr_ddl_grace_timeout = 10000;
-
 
 static size_t
 bdr_locks_shmem_size(void)
@@ -1598,7 +1603,7 @@ bdr_locks_shmem_init()
 }
 
 void
-bdr_acquire_ddl_lock(void)
+bdr_acquire_ddl_lock(BDRLockType lock_type)
 {
 }