summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2009-07-30 09:28:03 +0000
committerMagnus Hagander <magnus@hagander.net>2009-07-30 09:28:03 +0000
commit4f9bb2766d7f91acbc349a39360e5fed81023c79 (patch)
tree4691fa8741525575a3a07a209215b2867e794594
parente9d2f68632aaa12cd7a17a33675a947734df2be6 (diff)
Make sure FD_SETSIZE is set before we include any Windows
header files. Josh Williams
-rw-r--r--contrib/pgbench/pgbench.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index ce35bd3dff5..f8d46604d48 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.75 2007/12/11 02:31:49 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.75.2.1 2009/07/30 09:28:03 mha Exp $
*
* pgbench: a simple benchmark program for PostgreSQL
* written by Tatsuo Ishii
@@ -17,6 +17,11 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*/
+
+#ifdef WIN32
+#define FD_SETSIZE 1024 /* set before winsock2.h is included */
+#endif /* ! WIN32 */
+
#include "postgres_fe.h"
#include "libpq-fe.h"
@@ -24,8 +29,6 @@
#include <ctype.h>
#ifdef WIN32
-#undef FD_SETSIZE
-#define FD_SETSIZE 1024
#include <win32.h>
#else
#include <sys/time.h>