Commit600fc1d

committed

Get rid of some more stuff that duplicates c.h or port.h.

1 parent14bd1c3 commit600fc1dCopy full SHA for 600fc1d

File tree

-20

lines changed

-20

lines changed

Lines changed: 0 additions & 1 deletion

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,8 @@`
`6`	`6`
`7`	`7`	`#include"pg_upgrade.h"`
`8`	`8`
`9`		`-#include<sys/types.h>`
`10`	`9`	`#include<fcntl.h>`
`11`	`10`
`12`		`-#ifdefWIN32`
`13`		`-#include<windows.h>`
`14`		`-#endif`
`15`		`-`
`16`	`11`
`17`	`12`	`staticintcopy_file(constcharfromfile,constchartofile,boolforce);`
`18`	`13`

Lines changed: 1 addition & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,10 @@`
`5`	`5`	`#include"postgres.h"`
`6`	`6`
`7`	`7`	`#include<unistd.h>`
`8`		`-#include<string.h>`
`9`		`-#include<stdio.h>`
`10`	`8`	`#include<assert.h>`
`11`	`9`	`#include<dirent.h>`
`12`	`10`	`#include<sys/stat.h>`
`13`	`11`	`#include<sys/time.h>`
`14`		`-#include<sys/types.h>`
`15`	`12`
`16`	`13`	`#include"libpq-fe.h"`
`17`	`14`
`@@ -38,26 +35,16 @@`
`38`	`35`	`#definepg_copy_filecopy_file`
`39`	`36`	`#definepg_mv_filerename`
`40`	`37`	`#definepg_link_filelink`
`41`		`-#defineDEVNULL"/dev/null"`
`42`		`-#defineDEVTTY"/dev/tty"`
`43`	`38`	`#defineRMDIR_CMD"rm -rf"`
`44`	`39`	`#defineEXEC_EXT"sh"`
`45`	`40`	`#else`
`46`	`41`	`#definepg_copy_fileCopyFile`
`47`	`42`	`#definepg_mv_filepgrename`
`48`	`43`	`#definepg_link_filewin32_pghardlink`
`49`		`-#defineEXE_EXT".exe"`
`50`	`44`	`#definesleep(x)Sleep(x * 1000)`
`51`		`-#defineDEVNULL"nul"`
`52`		`-/* "con" does not work from the Msys 1.0.10 console (part of MinGW). */`
`53`		`-#defineDEVTTY "con"`
`54`		`-/* from pgport */`
`55`		`-externintpgrename(constcharfrom,constcharto);`
`56`		`-externintpgunlink(constchar*path);`
`57`		`-#definerename(from,to)pgrename(from, to)`
`58`		`-#defineunlink(path)pgunlink(path)`
`59`	`45`	`#defineRMDIR_CMD"RMDIR /s/q"`
`60`	`46`	`#defineEXEC_EXT"bat"`
	`47`	`+#defineEXE_EXT".exe"`
`61`	`48`	`#endif`
`62`	`49`
`63`	`50`	`#defineCLUSTERNAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")`

Comments

(0)