diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-09-27 20:39:43 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-09-27 20:39:43 +0000 |
commit | ffda674769cd71071317b9cdb7f79c3affecc33d (patch) | |
tree | d801dd8ef11cbfd8c77cc870fd9871833a57daaa | |
parent | 314ed5de6db214600595ddf46eacffb23d0a72e1 (diff) | |
download | postgresql-ffda674769cd71071317b9cdb7f79c3affecc33d.tar.gz postgresql-ffda674769cd71071317b9cdb7f79c3affecc33d.zip |
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.
-rw-r--r-- | contrib/pgbench/pgbench.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 1f1f77e66bc..754d8fd804b 100644 --- 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 */ |