Tweak pgbench.c to remove the hidden assumption that a WIN32 machine

couldn't possibly HAVE_GETOPT.  I believe this is the most appropriate
form of the patch submitted 2007-08-07 by Hiroshi Saito, though not
having a Windows build environment I won't know for sure till I see
the buildfarm results.

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 1f1f77e66bc03b19e0d2fe9e0c5cde676fb54ad5..754d8fd804bb66ef030dc116b792a7366fc0b5aa 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.71 2007/08/25 09:21:14 ishii Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.72 2007/09/27 20:39:43 tgl Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -24,10 +24,11 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include "win32.h"
+#include <win32.h>
 #else
 #include <sys/time.h>
 #include <unistd.h>
+#endif   /* ! WIN32 */
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -40,15 +41,10 @@
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>      /* for getrlimit */
 #endif
-#endif   /* ! WIN32 */
 
 extern char *optarg;
 extern int optind;
 
-#ifdef WIN32
-#undef select
-#endif
-
 
 /********************************************************************
  * some configurable parameters */