bdr: Don't include frontend libpq in generic bdr header.
authorAndres Freund <andres@anarazel.de>
Tue, 29 Apr 2014 18:31:41 +0000 (20:31 +0200)
committerAndres Freund <andres@anarazel.de>
Thu, 3 Jul 2014 15:55:29 +0000 (17:55 +0200)
Otherwise we need to link to libpq on windows to get the right include
dir added.

contrib/bdr/bdr.h

index 2599a9f0fb0e537e6bf44185591ba95dfbff5c04..0f22cfad6633420aa743c0cad98ba7b4405297e0 100644 (file)
@@ -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"
 
 #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);