From a23c6415787bd1aa8f1c44446d689a874a78afea Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 30 Jul 2009 09:28:00 +0000 Subject: [PATCH] Make sure FD_SETSIZE is set before we include any Windows header files. Josh Williams --- contrib/pgbench/pgbench.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 85b12b6eca..7ede6954aa 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.88 2009/07/30 09:28:00 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 #ifdef WIN32 -#undef FD_SETSIZE -#define FD_SETSIZE 1024 #include #else #include