Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dont include libpq-int.h #520

Open
wants to merge 1 commit into
base: REL_2_5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/backup.c
Original file line number Diff line number Diff line change
Expand Up @@ -2270,6 +2270,7 @@ check_external_for_tablespaces(parray *external_list, PGconn *backup_conn)
PGresult *res;
int i = 0;
int j = 0;
int ntups;
char *tablespace_path = NULL;
char *query = "SELECT pg_catalog.pg_tablespace_location(oid) "
"FROM pg_catalog.pg_tablespace "
Expand All @@ -2281,7 +2282,8 @@ check_external_for_tablespaces(parray *external_list, PGconn *backup_conn)
if (!res)
elog(ERROR, "Failed to get list of tablespaces");

for (i = 0; i < res->ntups; i++)
ntups = PQntuples(res);
for (i = 0; i < ntups; i++)
{
tablespace_path = PQgetvalue(res, i, 0);
Assert (strlen(tablespace_path) > 0);
Expand Down
4 changes: 3 additions & 1 deletion src/catchup.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ catchup_check_tablespaces_existance_in_tbsmapping(PGconn *conn)
{
PGresult *res;
int i;
int ntups;
char *tablespace_path = NULL;
const char *linked_path = NULL;
char *query = "SELECT pg_catalog.pg_tablespace_location(oid) "
Expand All @@ -249,7 +250,8 @@ catchup_check_tablespaces_existance_in_tbsmapping(PGconn *conn)
if (!res)
elog(ERROR, "Failed to get list of tablespaces");

for (i = 0; i < res->ntups; i++)
ntups = PQntuples(res);
for (i = 0; i < ntups; i++)
{
tablespace_path = PQgetvalue(res, i, 0);
Assert (strlen(tablespace_path) > 0);
Expand Down
1 change: 0 additions & 1 deletion src/pg_probackup.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#include "postgres_fe.h"
#include "libpq-fe.h"
#include "libpq-int.h"

#include "access/xlog_internal.h"
#include "utils/pg_crc.h"
Expand Down
1 change: 1 addition & 0 deletions src/utils/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "pg_probackup.h"
/* sys/stat.h must be included after pg_probackup.h (see problems with compilation for windows described in PGPRO-5750) */
#include <sys/stat.h>
#include <signal.h>

#include "file.h"
#include "storage/checksum.h"
Expand Down