Commita79b46b

committed

Allow trace_sort to be declared local to provide compatibility with

Windows builds of non-PGPRO versions and on versions < 13

1 parentaebcf8a commita79b46bCopy full SHA for a79b46b

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`#include"commands/tablespace.h"`
`23`	`23`	`#include"executor/executor.h"`
`24`		`-#include"utils/guc.h"`
`25`	`24`	`#include"utils/logtape.h"`
`26`	`25`	`#include"utils/pg_rusage.h"`
`27`	`26`
`@@ -52,13 +51,18 @@`
`52`	`51`	`* Below are copied definitions from src/backend/utils/sort/tuplesort.c.`
`53`	`52`	`*/`
`54`	`53`
`55`		`-/* GUC variables shouldn't be declared explicitely.`
`56`		`- Rather corresponigng include file should be include because it`
`57`		`- contains neccessary Windows export/import magic. And part of this`
`58`		`- magic should be done during postgres.exe compilation`
`59`		`-*/`
	`54`	`+/* For PGPRO since v.13 trace_sort is imported from backend by including its`
	`55`	`+ * declaration in guc.h (guc.h contains added Windows export/import magic to be done`
	`56`	`+ * during postgres.exe compilation).`
	`57`	`+ * For older or non-PGPRO versions on Windows platform trace_sort is not exported by`
	`58`	`+ * backend so it is declared local for this case.`
	`59`	`+ */`
`60`	`60`	`#ifdefTRACE_SORT`
`61`		`-#include<utils/guc.h>`
	`61`	`+#ifPG_VERSION_NUM >=130000&& defined (PGPRO_VERSION)`
	`62`	`+#include"utils/guc.h"`
	`63`	`+#else`
	`64`	`+booltrace_sort= false;`
	`65`	`+#endif`
`62`	`66`	`#endif`
`63`	`67`
`64`	`68`	`typedefstruct`

Comments

(0)