From ba08155bd5e6dffe5cd4bda9e7d6616b5e20d564 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 26 Mar 2014 10:22:16 -0400
Subject: [PATCH] pg_upgrade: use pg_usleep(); remove Windows workaround
---
contrib/pg_upgrade/exec.c | 2 +-
contrib/pg_upgrade/pg_upgrade.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index ddf16d2497e..c991a8d033f 100644
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -102,7 +102,7 @@ static DWORD mainThreadId = 0;
for (iter = 0; iter < 4 && log == NULL; iter++)
{
- sleep(1);
+ pg_usleep(1000000); /* 1 sec */
log = fopen(log_file, "a");
}
}
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 389ec936d04..14039b4d3de 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -83,7 +83,6 @@ extern char *output_files[];
#define pg_copy_file CopyFile
#define pg_mv_file pgrename
#define pg_link_file win32_pghardlink
-#define sleep(x) Sleep(x * 1000)
#define PATH_SEPARATOR '\\'
#define RM_CMD "DEL /q"
#define RMDIR_CMD "RMDIR /s/q"
--
GitLab