[PGPRO-4074] Windows compatibility for multimaster.

arssher · arssher · commit a8dfe411bb37 · 2021-02-28T17:12:20.000+03:00
tags: multimaster
(cherry picked from commit c1f288847b6da5c323a1d749d50d5f3ea33f98c4)
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -85,7 +85,7 @@
  * because they're passed down from the startup process, for better
  * synchronization.)
  */
-int			wal_receiver_status_interval;
+int			wal_receiver_status_interval = 0;
 int			wal_receiver_timeout;
 bool		hot_standby_feedback;
 
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
@@ -111,7 +111,7 @@ extern int	wal_keep_size_mb;
 extern int	max_slot_wal_keep_size_mb;
 extern int	XLOGbuffers;
 extern int	XLogArchiveTimeout;
-extern int	wal_retrieve_retry_interval;
+extern PGDLLIMPORT int	wal_retrieve_retry_interval;
 extern char *XLogArchiveCommand;
 extern bool EnableHotStandby;
 extern bool fullPageWrites;
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
@@ -24,7 +24,7 @@
 #include "utils/tuplestore.h"
 
 /* user-settable parameters */
-extern int	wal_receiver_status_interval;
+extern PGDLLIMPORT int	wal_receiver_status_interval;
 extern int	wal_receiver_timeout;
 extern bool hot_standby_feedback;
 
diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h
@@ -25,13 +25,13 @@ typedef enum
 } CRSSnapshotAction;
 
 /* global state */
-extern bool am_walsender;
+extern PGDLLIMPORT bool am_walsender;
 extern bool am_cascading_walsender;
 extern bool am_db_walsender;
 extern bool wake_wal_senders;
 
 /* user-settable parameters */
-extern int	max_wal_senders;
+extern PGDLLIMPORT int max_wal_senders;
 extern int	wal_sender_timeout;
 extern bool log_replication_commands;
 
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -33,8 +33,8 @@ my @unlink_on_exit;
 
 # Set of variables for modules in contrib/ and src/test/modules/
 my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
-my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
-my @contrib_uselibpgport   = ('oid2name', 'pg_standby', 'vacuumlo');
+my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo', 'multimaster');
+my @contrib_uselibpgport   = ('oid2name', 'pg_standby', 'vacuumlo', 'multimaster');
 my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
 my $contrib_extralibs      = undef;
 my $contrib_extraincludes = { 'dblink' => ['src/backend'] };
