aboutsummaryrefslogtreecommitdiff
path: root/src/bin/psql/copy.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2004-04-19 17:42:59 +0000
committerBruce Momjian <bruce@momjian.us>2004-04-19 17:42:59 +0000
commit31338352bd89439c7c55d25c13d88338fa874771 (patch)
tree318c34ab817a8d3e47b2fa6fa1c37ceacd8541a4 /src/bin/psql/copy.c
parent862b20b3822887bdb3b42a72ea0e73dc8028fb31 (diff)
downloadpostgresql-31338352bd89439c7c55d25c13d88338fa874771.tar.gz
postgresql-31338352bd89439c7c55d25c13d88338fa874771.zip
* 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/bin/psql/copy.c')
-rw-r--r--src/bin/psql/copy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index e01afb82142..0241b8eda27 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.44 2004/04/19 17:22:31 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.45 2004/04/19 17:42:58 momjian Exp $
*/
#include "postgres_fe.h"
#include "copy.h"
@@ -26,7 +26,7 @@
#include "prompt.h"
#include "stringutils.h"
-#ifdef WIN32
+#if defined(WIN32) && (!defined(__MINGW32__))
#define strcasecmp(x,y) stricmp(x,y)
#define __S_ISTYPE(mode, mask) (((mode) & S_IFMT) == (mask))
#define S_ISDIR(mode) __S_ISTYPE((mode), S_IFDIR)