Skip to content

Commit d241733

Browse files
authored
Merge pull request #497 from postgrespro/PBCKP-181
object fio
2 parents 6e70ef9 + 2abdff3 commit d241733

37 files changed

+10666
-1076
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ PROGRAM := pg_probackup
3737
# pg_probackup sources
3838
OBJS := src/utils/configuration.o src/utils/json.o src/utils/logger.o \
3939
src/utils/parray.o src/utils/pgut.o src/utils/thread.o src/utils/remote.o src/utils/file.o
40+
OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
4041
OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o src/data.o \
4142
src/delete.o src/dir.o src/fetch.o src/help.o src/init.o src/merge.o \
4243
src/parsexlog.o src/ptrack.o src/pg_probackup.o src/restore.o src/show.o src/stream.o \
@@ -87,7 +88,8 @@ endif
8788
undefine PG_MAJORVER
8889

8990
#
90-
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -I$(top_pbk_srcdir)/src -I$(BORROW_DIR)
91+
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -I$(top_pbk_srcdir)src -I$(BORROW_DIR)
92+
PG_CPPFLAGS += -I$(top_pbk_srcdir)src/fu_util -Wno-declaration-after-statement
9193
ifdef VPATH
9294
PG_CPPFLAGS += -Isrc
9395
endif

gen_probackup_project.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ sub build_pgprobackup
214214
$probackup->AddIncludeDir("$currpath");
215215
$probackup->AddIncludeDir("$currpath/src");
216216
$probackup->AddIncludeDir("$currpath/src/utils");
217+
$probackup->AddIncludeDir("$currpath/src/fu_util");
217218

218219
if ($libpgfeutils)
219220
{

0 commit comments

Comments
 (0)