From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 30 Jul 2009 09:28:05 +0000 (+0000)
Subject: Make sure FD_SETSIZE is set before we include any Windows
X-Git-Tag: REL8_4_1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53890f8073894d0793b1619270d069cf04705fdf;p=postgresql

Make sure FD_SETSIZE is set before we include any Windows
header files.

Josh Williams
---

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 85b12b6eca..0906d16149 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>