Skip to content
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ borrowed.mk: $(firstword $(MAKEFILE_LIST))
$(file >$@,# This file is autogenerated. Do not edit!)
$(foreach borrowed_file, $(BORROWED_H_SRC) $(BORROWED_C_SRC), \
$(file >>$@,$(addprefix $(BORROW_DIR)/, $(notdir $(borrowed_file))): | $(CURDIR)/$(BORROW_DIR)/ $(realpath $(top_srcdir)/$(borrowed_file))) \
$(file >>$@,$(shell echo "\t"'$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
$(file >>$@, $$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@) \
)
include borrowed.mk

Expand Down
8 changes: 8 additions & 0 deletions src/backup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1946,11 +1946,19 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
int segno;
pgFile **file_item;
pgFile f;
#if PG_VERSION_NUM >= 180000
RelPathStr rel_path_str;
#endif

segno = blkno / RELSEG_SIZE;
blkno_inseg = blkno % RELSEG_SIZE;

#if PG_VERSION_NUM >= 180000
rel_path_str = relpathperm(rnode, forknum);
rel_path = pstrdup(rel_path_str.str);
#else
rel_path = relpathperm(rnode, forknum);
#endif
if (segno > 0)
f.rel_path = psprintf("%s.%u", rel_path, segno);
else
Expand Down
4 changes: 4 additions & 0 deletions src/utils/pgut.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,11 @@ handle_interrupt(SIGNAL_ARGS)
static void
init_cancel_handler(void)
{
#if PG_VERSION_NUM >= 180000
oldhandler = signal(SIGINT, handle_interrupt);
#else
oldhandler = pqsignal(SIGINT, handle_interrupt);
#endif
pqsignal(SIGQUIT, handle_interrupt);
pqsignal(SIGTERM, handle_interrupt);
pqsignal(SIGPIPE, handle_interrupt);
Expand Down