Commit8b3d528

committed

Properly install dynloader.h on MSVC builds

This will enable PL/Java to be cleanly compiled, as dynloader.h is arequirement.Report by Chapman FlackPatch by Michael PaquierBackpatch through 9.1

1 parentfc5d5e9 commit8b3d528Copy full SHA for 8b3d528

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,7 @@`
`16`	`16`
`17`	`17`	`#include<sys/stat.h>`
`18`	`18`
`19`		`-#ifndefWIN32_ONLY_COMPILER`
`20`	`19`	`#include"dynloader.h"`
`21`		`-#else`
`22`		`-#include"port/dynloader/win32.h"`
`23`		`-#endif`
`24`	`20`	`#include"lib/stringinfo.h"`
`25`	`21`	`#include"miscadmin.h"`
`26`	`22`	`#include"utils/dynamic_loader.h"`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ sub CopyIncludeFiles`
`530`	`530`	`'Public headers',$target .'/include/',`
`531`	`531`	`'src/include/','postgres_ext.h',`
`532`	`532`	`'pg_config.h','pg_config_ext.h',`
`533`		`-'pg_config_os.h','pg_config_manual.h');`
	`533`	`+'pg_config_os.h','dynloader.h','pg_config_manual.h');`
`534`	`534`	`lcopy('src/include/libpq/libpq-fs.h',$target .'/include/libpq/')`
`535`	`535`	`\|\| croak'Could not copy libpq-fs.h';`
`536`	`536`
`@@ -553,7 +553,8 @@ sub CopyIncludeFiles`
`553`	`553`	`CopyFiles(`
`554`	`554`	`'Server headers',`
`555`	`555`	`$target .'/include/server/',`
`556`		`-'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h');`
	`556`	`+'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h',`
	`557`	`+'dynloader.h');`
`557`	`558`	`CopyFiles(`
`558`	`559`	`'Grammar header',`
`559`	`560`	`$target .'/include/server/parser/',`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,14 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`289`	`289`	`'src\include\utils\fmgroids.h');`
`290`	`290`	`}`
`291`	`291`
	`292`	`+if (IsNewer(`
	`293`	`+'src/include/dynloader.h',`
	`294`	`+'src/backend/port/dynloader/win32.h'))`
	`295`	`+{`
	`296`	`+copyFile('src/backend/port/dynloader/win32.h',`
	`297`	`+'src/include/dynloader.h');`
	`298`	`+}`
	`299`	`+`
`292`	`300`	`if (IsNewer('src\include\utils\probes.h','src\backend\utils\probes.d'))`
`293`	`301`	`{`
`294`	`302`	`print"Generating probes.h...\n";`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ REM Delete files created with GenerateFiles() in Solution.pm`
`24`	`24`	`ifexist src\include\pg_config.hdel /q src\include\pg_config.h`
`25`	`25`	`ifexist src\include\pg_config_ext.hdel /q src\include\pg_config_ext.h`
`26`	`26`	`ifexist src\include\pg_config_os.hdel /q src\include\pg_config_os.h`
	`27`	`+ifexist src\include\dynloader.hdel /q src\include\dynloader.h`
`27`	`28`	`if%DIST%==1ifexist src\backend\parser\gram.hdel /q src\backend\parser\gram.h`
`28`	`29`	`ifexist src\include\utils\errcodes.hdel /q src\include\utils\errcodes.h`
`29`	`30`	`ifexist src\include\utils\fmgroids.hdel /q src\include\utils\fmgroids.h`

Comments

(0)