From: Andres Freund <andres@anarazel.de>
Date: Tue, 29 Apr 2014 18:31:41 +0000 (+0200)
Subject: bdr: Don't include frontend libpq in generic bdr header.
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=f23f7a253cc49a1face101e9045fdc9dca9cb36c;p=users%2Fandresfreund%2Fpostgres.git

bdr: Don't include frontend libpq in generic bdr header.

Otherwise we need to link to libpq on windows to get the right include
dir added.
---

diff --git a/contrib/bdr/bdr.h b/contrib/bdr/bdr.h
index 2599a9f0fb..0f22cfad66 100644
--- a/contrib/bdr/bdr.h
+++ b/contrib/bdr/bdr.h
@@ -11,7 +11,6 @@
 #define BDR_H
 
 #include "access/xlogdefs.h"
-#include "libpq-fe.h"
 #include "postmaster/bgworker.h"
 #include "replication/logical.h"
 #include "utils/resowner.h"
@@ -22,6 +21,12 @@
 
 #define BDR_INIT_REPLICA_CMD "bdr_initial_load"
 
+/*
+ * Don't include libpq here, msvc infrastructure requires linking to libpq
+ * otherwise.
+ */
+struct pg_conn;
+
 /*
  * Flags to indicate which fields are present in a commit record sent by the
  * output plugin.
@@ -207,13 +212,13 @@ extern void init_bdr_commandfilter(void);
 extern void bdr_apply_main(Datum main_arg);
 
 /* helpers shared by multiple worker types */
-extern PGconn*
+extern struct pg_conn *
 bdr_connect(char *conninfo_repl,
 			char* remote_ident, size_t remote_ident_length,
 			NameData* slot_name,
 			uint64* remote_sysid_i, TimeLineID *remote_tlid_i);
 
-extern PGconn*
+extern struct pg_conn *
 bdr_establish_connection_and_slot(Name connection_name, Name out_slot_name,
 	uint64 *out_sysid, TimeLineID* out_timeline, RepNodeId
 	*out_replication_identifier, char **out_snapshot);