diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
| commit | 31338352bd89439c7c55d25c13d88338fa874771 (patch) | |
| tree | 318c34ab817a8d3e47b2fa6fa1c37ceacd8541a4 /src/backend/utils | |
| parent | 862b20b3822887bdb3b42a72ea0e73dc8028fb31 (diff) | |
* Most changes are to fix warnings issued when compiling win32
* removed a few redundant defines
* get_user_name safe under win32
* rationalized pipe read EOF for win32 (UPDATED PATCH USED)
* changed all backend instances of sleep() to pg_usleep
- except for the SLEEP_ON_ASSERT in assert.c, as it would exceed a
32-bit long [Note to patcher: If a SLEEP_ON_ASSERT of 2000 seconds is
acceptable, please replace with pg_usleep(2000000000L)]
I added a comment to that part of the code:
/*
* It would be nice to use pg_usleep() here, but only does 2000 sec
* or 33 minutes, which seems too short.
*/
sleep(1000000);
Claudio Natoli
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/error/assert.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/hash/dynahash.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c index afd30b081f2..f35636e9fec 100644 --- a/src/backend/utils/error/assert.c +++ b/src/backend/utils/error/assert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.25 2003/11/29 19:52:01 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.26 2004/04/19 17:42:58 momjian Exp $ * * NOTE * This should eventually work with elog() @@ -40,7 +40,11 @@ ExceptionalCondition(char *conditionName, } #ifdef SLEEP_ON_ASSERT - sleep(1000000); + /* + * It would be nice to use pg_usleep() here, but only does 2000 sec + * or 33 minutes, which seems too short. + */ + sleep(1000000); #endif abort(); diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index c58359ccb82..e72800f3a79 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.50 2003/12/29 23:54:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.51 2004/04/19 17:42:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,6 +85,7 @@ DynaHashAlloc(Size size) } #define MEM_ALLOC DynaHashAlloc +#undef MEM_FREE /* already in windows header files */ #define MEM_FREE pfree diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 075269b4ad0..75cc07a518d 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.123 2004/02/10 01:55:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.124 2004/04/19 17:42:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -213,11 +213,11 @@ SetDataDir(const char *dir) * generating funny-looking paths to individual files. */ newlen = strlen(new); - if (newlen > 1 && new[newlen - 1] == '/' + if (newlen > 1 && (new[newlen - 1] == '/' #ifdef WIN32 || new[newlen - 1] == '\\' #endif - ) + )) new[newlen - 1] = '\0'; if (DataDir) |