diff options
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 5 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/s_lock.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 203e03ab059..0ad26ee4f0b 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.157 2004/02/10 01:55:25 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.158 2004/02/10 03:42:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -44,7 +44,6 @@ #include <math.h> #include <signal.h> #include <sys/file.h> -#include <sys/time.h> #include <unistd.h> #include "lib/stringinfo.h" @@ -972,7 +971,7 @@ BufferBackgroundWriter(void) * Nap for the configured time or sleep for 10 seconds if * there was nothing to do at all. */ - PG_USLEEP((n > 0) ? BgWriterDelay * 1000 : 10000000); + pg_usleep((n > 0) ? BgWriterDelay * 1000L : 10000000L); } } diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 85d1a16516a..dcbf210519b 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,13 +9,12 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.24 2004/01/09 21:08:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.25 2004/02/10 03:42:45 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include <sys/time.h> #include <unistd.h> #include "storage/s_lock.h" @@ -96,7 +95,7 @@ s_lock(volatile slock_t *lock, const char *file, int line) if (++delays > NUM_DELAYS) s_lock_stuck(lock, file, line); - PG_USLEEP(cur_delay * 10000); + pg_usleep(cur_delay * 10000L); #if defined(S_LOCK_TEST) fprintf(stdout, "*"); |