Commit ffda6747 authored by Tom Lane's avatar Tom Lane

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.
parent 314ed5de
/* /*
* $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 * pgbench: a simple benchmark program for PostgreSQL
* written by Tatsuo Ishii * written by Tatsuo Ishii
...@@ -24,10 +24,11 @@ ...@@ -24,10 +24,11 @@
#include <ctype.h> #include <ctype.h>
#ifdef WIN32 #ifdef WIN32
#include "win32.h" #include <win32.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#endif /* ! WIN32 */
#ifdef HAVE_GETOPT_H #ifdef HAVE_GETOPT_H
#include <getopt.h> #include <getopt.h>
...@@ -40,15 +41,10 @@ ...@@ -40,15 +41,10 @@
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h> /* for getrlimit */ #include <sys/resource.h> /* for getrlimit */
#endif #endif
#endif /* ! WIN32 */
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
#ifdef WIN32
#undef select
#endif
/******************************************************************** /********************************************************************
* some configurable parameters */ * some configurable parameters */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment