For immediate application to HEAD.

Corrects bit-rot of recently applied patch. win32/cygwin only.

Claudio Natoli

diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 51ddd875c5f40b9336e5a03de3b4444a54b8c8de..a0ab8a7a93834e7d85dbc0d00abe6573d8d76d2d 100644 (file)
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -10,7 +10,7 @@
  *     Win32 (NT, Win2k, XP).  replace() doesn't work on Win95/98/Me.
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/port/dirmod.c,v 1.11 2004/02/25 19:41:23 momjian Exp $
+ *       $PostgreSQL: pgsql/src/port/dirmod.c,v 1.12 2004/02/26 02:59:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,9 +19,6 @@
 
 #if defined(WIN32) || defined(__CYGWIN__)
 
-#ifdef __CYGWIN__
-#include <sys/time.h> /* timeval definition for PG_USLEEP */
-#endif
 
 #ifndef FRONTEND
 #include "postgres.h"
@@ -53,7 +50,7 @@ pgrename(const char *from, const char *to)
 #endif
                        /* set errno? */
                        return -1;
-               PG_USLEEP(100000);                              /* us */
+               pg_usleep(100000);                              /* us */
                if (loops == 30)
 #ifndef FRONTEND
                        elog(LOG, "could not rename \"%s\" to \"%s\", continuing to try",
@@ -85,7 +82,7 @@ pgunlink(const char *path)
                if (errno != EACCES)
                        /* set errno? */
                        return -1;
-               PG_USLEEP(100000);                              /* us */
+               pg_usleep(100000);                              /* us */
                if (loops == 30)
 #ifndef FRONTEND
                        elog(LOG, "could not unlink \"%s\", continuing to try",