mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-03 08:00:21 +08:00
Assorted fixes to make pg_upgrade build on MSVC.
* There is no chmod() on Windows. * Must always use the 3-parameter version of open() * There is no dynloader.h - but it also appears unnecessary on all platforms * Don't include shlobj.h because it causes compile errors, and from what I can see it's not actually used. This may need to be added back for mingw and/or cygwin in the worst case.
This commit is contained in:
parent
f1ac08daee
commit
2b61b3e507
@ -427,9 +427,11 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
|
||||
|
||||
fclose(script);
|
||||
|
||||
#ifndef WIN32
|
||||
if (chmod(*deletion_script_file_name, S_IRWXU) != 0)
|
||||
pg_log(ctx, PG_FATAL, "Could not add execute permission to file: %s\n",
|
||||
*deletion_script_file_name);
|
||||
#endif
|
||||
|
||||
check_ok(ctx);
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ is_server_running(migratorContext *ctx, const char *datadir)
|
||||
|
||||
snprintf(path, sizeof(path), "%s/postmaster.pid", datadir);
|
||||
|
||||
if ((fd = open(path, O_RDONLY)) < 0)
|
||||
if ((fd = open(path, O_RDONLY, 0)) < 0)
|
||||
{
|
||||
if (errno != ENOENT)
|
||||
pg_log(ctx, PG_FATAL, "\ncould not open file \"%s\" for reading\n",
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
#include "pg_upgrade.h"
|
||||
|
||||
#include "dynloader.h"
|
||||
#include "storage/bufpage.h"
|
||||
|
||||
|
||||
|
@ -12,9 +12,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef WIN32
|
||||
#include <shlobj.h>
|
||||
#endif
|
||||
|
||||
#include "libpq-fe.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user