Commit7a47262

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 parentf704f43 commit7a47262Copy full SHA for 7a47262

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
`@@ -499,7 +499,7 @@ sub CopyIncludeFiles`
`499`	`499`	`'Public headers',$target .'/include/',`
`500`	`500`	`'src/include/','postgres_ext.h',`
`501`	`501`	`'pg_config.h','pg_config_ext.h',`
`502`		`-'pg_config_os.h','pg_config_manual.h');`
	`502`	`+'pg_config_os.h','dynloader.h','pg_config_manual.h');`
`503`	`503`	`lcopy('src/include/libpq/libpq-fs.h',$target .'/include/libpq/')`
`504`	`504`	`\|\| croak'Could not copy libpq-fs.h';`
`505`	`505`
`@@ -522,7 +522,8 @@ sub CopyIncludeFiles`
`522`	`522`	`CopyFiles(`
`523`	`523`	`'Server headers',`
`524`	`524`	`$target .'/include/server/',`
`525`		`-'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h');`
	`525`	`+'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h',`
	`526`	`+'dynloader.h');`
`526`	`527`	`CopyFiles(`
`527`	`528`	`'Grammar header',`
`528`	`529`	`$target .'/include/server/parser/',`

Lines changed: 8 additions & 0 deletions

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