diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Install.pm | 5 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 8 | ||||
| -rwxr-xr-x | src/tools/msvc/clean.bat | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 7edfe973851..f41035d33c8 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -16,11 +16,7 @@ #include <sys/stat.h> -#ifndef WIN32_ONLY_COMPILER #include "dynloader.h" -#else -#include "port/dynloader/win32.h" -#endif #include "lib/stringinfo.h" #include "miscadmin.h" #include "storage/shmem.h" diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 40e06f62e67..ea9b8571a12 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -582,7 +582,7 @@ sub CopyIncludeFiles 'Public headers', $target . '/include/', 'src/include/', 'postgres_ext.h', 'pg_config.h', 'pg_config_ext.h', - 'pg_config_os.h', 'pg_config_manual.h'); + 'pg_config_os.h', 'dynloader.h', 'pg_config_manual.h'); lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/') || croak 'Could not copy libpq-fs.h'; @@ -605,7 +605,8 @@ sub CopyIncludeFiles CopyFiles( 'Server headers', $target . '/include/server/', - 'src/include/', 'pg_config.h', 'pg_config_ext.h', 'pg_config_os.h'); + 'src/include/', 'pg_config.h', 'pg_config_ext.h', 'pg_config_os.h', + 'dynloader.h'); CopyFiles( 'Grammar header', $target . '/include/server/parser/', diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 1564b728090..ac116b76e73 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -301,6 +301,14 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY 'src/include/storage/lwlocknames.h'); } + if (IsNewer( + 'src/include/dynloader.h', + 'src/backend/port/dynloader/win32.h')) + { + copyFile('src/backend/port/dynloader/win32.h', + 'src/include/dynloader.h'); + } + if (IsNewer('src/include/utils/probes.h', 'src/backend/utils/probes.d')) { print "Generating probes.h...\n"; diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index e3da6aa282f..feb0fe5b85e 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -38,6 +38,7 @@ REM Delete files created with GenerateFiles() in Solution.pm if exist src\include\pg_config.h del /q src\include\pg_config.h if exist src\include\pg_config_ext.h del /q src\include\pg_config_ext.h if exist src\include\pg_config_os.h del /q src\include\pg_config_os.h +if exist src\include\dynloader.h del /q src\include\dynloader.h if %DIST%==1 if exist src\backend\parser\gram.h del /q src\backend\parser\gram.h if exist src\include\utils\errcodes.h del /q src\include\utils\errcodes.h if exist src\include\utils\fmgroids.h del /q src\include\utils\fmgroids.h |