Commit9a7d49d

committed

Move pg_dump memory routines into pg_dumpmem.c/h and restore common.c

with its original functions. The previous function migration wouldcause too many difficulties in back-patching.

1 parentefb0423 commit9a7d49dCopy full SHA for 9a7d49d

File tree

+1038

-1037

lines changed

+1038

-1037

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)`
`20`	`20`
`21`	`21`	`OBJS=pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o\`
`22`	`22`	`pg_backup_files.o pg_backup_null.o pg_backup_tar.o\`
`23`		`-pg_backup_directory.ocommon.o dumputils.o compress_io.o$(WIN32RES)`
	`23`	`+pg_backup_directory.odumpmem.o dumputils.o compress_io.o$(WIN32RES)`
`24`	`24`
`25`	`25`	`KEYWRDOBJS = keywords.o kwlookup.o`
`26`	`26`
`@@ -29,8 +29,8 @@ kwlookup.c: % : $(top_srcdir)/src/backend/parser/%`
`29`	`29`
`30`	`30`	`all: pg_dump pg_restore pg_dumpall`
`31`	`31`
`32`		`-pg_dump: pg_dump.odumpcatalog.o pg_dump_sort.o$(OBJS)$(KEYWRDOBJS) \| submake-libpq submake-libpgport`
`33`		`-$(CC)$(CFLAGS) pg_dump.odumpcatalog.o pg_dump_sort.o$(KEYWRDOBJS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)`
	`32`	`+pg_dump: pg_dump.ocommon.o pg_dump_sort.o$(OBJS)$(KEYWRDOBJS) \| submake-libpq submake-libpgport`
	`33`	`+$(CC)$(CFLAGS) pg_dump.ocommon.o pg_dump_sort.o$(KEYWRDOBJS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)`
`34`	`34`
`35`	`35`	`pg_restore: pg_restore.o$(OBJS)$(KEYWRDOBJS) \| submake-libpq submake-libpgport`
`36`	`36`	`$(CC)$(CFLAGS) pg_restore.o$(KEYWRDOBJS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)`

Comments

(0)