Win32 compile fixes for pgbench, pgcrypto, and tsearch.

Claudio Natoli

1 files changed, 9 insertions, 5 deletions

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index cf1880f242d..4dbf0d3fcfa 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.32 2004/08/29 05:06:36 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.33 2004/09/14 03:39:23 tgl Exp $
  *
  * pgbench: a simple TPC-B like benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -44,6 +44,10 @@
 extern char *optarg;
 extern int	optind;
 
+#ifdef WIN32
+#undef select
+#endif
+
 
 /********************************************************************
  * some configurable parameters */
@@ -705,7 +709,7 @@ main(int argc, char **argv)
 	int			nsocks;			/* return from select(2) */
 	int			maxsock;		/* max socket number to be waited */
 
-#ifndef __CYGWIN__
+#if !(defined(__CYGWIN__) || defined(__MINGW32__))
 	struct rlimit rlim;
 #endif
 
@@ -755,7 +759,7 @@ main(int argc, char **argv)
 					fprintf(stderr, "invalid number of clients: %d\n", nclients);
 					exit(1);
 				}
-#ifndef __CYGWIN__
+#if !(defined(__CYGWIN__) || defined(__MINGW32__))
 #ifdef RLIMIT_NOFILE			/* most platform uses RLIMIT_NOFILE */
 				if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
 				{
@@ -772,7 +776,7 @@ main(int argc, char **argv)
 					fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
 					exit(1);
 				}
-#endif   /* #ifndef __CYGWIN__ */
+#endif   /* #if !(defined(__CYGWIN__) || defined(__MINGW32__)) */
 				break;
 			case 'C':
 				is_connect = 1;
@@ -935,7 +939,7 @@ main(int argc, char **argv)
 
 	/* set random seed */
 	gettimeofday(&tv1, 0);
-	srand((uint) tv1.tv_usec);
+	srand((unsigned int) tv1.tv_usec);
 
 	/* get start up time */
 	gettimeofday(&tv1, 0);