summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2009-07-30 09:28:05 +0000
committerMagnus Hagander2009-07-30 09:28:05 +0000
commit53890f8073894d0793b1619270d069cf04705fdf (patch)
tree083cb34bc3ba7d175c1739011b201914f1f2473f
parent7b70d0a2c970f94c754d3b7729a87120e7c47101 (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 85b12b6eca4..0906d16149f 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -4,7 +4,7 @@
* A simple benchmark program for PostgreSQL
* Originally written by Tatsuo Ishii and enhanced by many contributors.
*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.87 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.87.2.1 2009/07/30 09:28:05 mha Exp $
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
* ALL RIGHTS RESERVED;
*
@@ -26,6 +26,11 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*
*/
+
+#ifdef WIN32
+#define FD_SETSIZE 1024 /* set before winsock2.h is included */
+#endif /* ! WIN32 */
+
#include "postgres_fe.h"
#include "libpq-fe.h"
@@ -34,8 +39,6 @@
#include <ctype.h>
#ifdef WIN32
-#undef FD_SETSIZE
-#define FD_SETSIZE 1024
#include <win32.h>
#else
#include <signal.h>