From 6b285d12c97ac126cd0746f7c3d294b7f3ba5c4a Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 16 Jul 2004 20:34:41 +0000
Subject: [PATCH] Merge OPENLDAP_FD_SETSIZE fix from HEAD

---
 CHANGES               |  1 +
 acconfig.h            | 13 +------------
 configure             |  2 +-
 include/ac/fdset.h    | 38 ++++++++++++++++++++++++++++++++++++++
 include/portable.h.in | 13 +------------
 5 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 include/ac/fdset.h

diff --git a/CHANGES b/CHANGES
index 8bc7d643b3..a5a6d2abbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ OpenLDAP 2.2.15 Engineering
 	Build environments
 		Added additional res_query detection for MacOS X
 		Added default ldapi:// SSF build setting
+		Fixed OPENLDAP_FD_SETSIZE macro handlling
 
 OpenLDAP 2.2.14 Release
 	Fixed back-bdb ignore deadlock bug (ITS#3188)
diff --git a/acconfig.h b/acconfig.h
index ab65e5b726..f6f86c05c9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -113,18 +113,7 @@
 #define vsprintf ber_pvt_vsprintf
 #endif
 
-#ifdef OPENLDAP_FD_SETSIZE
-	/* assume installer desires to enlarge fd_set */
-#ifdef HAVE_BITS_TYPES_H
-#include <bits/types.h>
-#endif
-#ifdef	__FD_SETSIZE
-#undef	__FD_SETSIZE
-#define	__FD_SETSIZE OPENLDAP_FD_SETSIZE
-#else
-#define	FD_SETSIZE OPENLDAP_FD_SETSIZE
-#endif
-#endif
+#include "ac/fdset.h"
 
 #include "ldap_cdefs.h"
 #include "ldap_features.h"
diff --git a/configure b/configure
index d6c2e4eb44..2c151a83bd 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.542 2004/06/18 01:56:35 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.478.2.20 2004/06/29 21:55:43 kurt Exp  
 
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
diff --git a/include/ac/fdset.h b/include/ac/fdset.h
new file mode 100644
index 0000000000..994828e40f
--- /dev/null
+++ b/include/ac/fdset.h
@@ -0,0 +1,38 @@
+/* redefine FD_SET */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * This header is to be included by portable.h to ensure
+ * tweaking of FD_SETSIZE is done early enough to be effective.
+ */
+
+#ifndef _AC_FDSET_H
+#define _AC_FDSET_H
+
+#ifdef OPENLDAP_FD_SETSIZE
+    /* assume installer desires to enlarge fd_set */
+#  ifdef HAVE_BITS_TYPES_H
+#    include <bits/types.h>
+#  endif
+#  ifdef __FD_SETSIZE
+#    undef __FD_SETSIZE
+#    define __FD_SETSIZE OPENLDAP_FD_SETSIZE
+#  else
+#    define FD_SETSIZE OPENLDAP_FD_SETSIZE
+#  endif
+#endif
+
+#endif /* _AC_FDSET_H */
diff --git a/include/portable.h.in b/include/portable.h.in
index bae833ed62..153251648a 100644
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -1031,18 +1031,7 @@
 #define vsprintf ber_pvt_vsprintf
 #endif
 
-#ifdef OPENLDAP_FD_SETSIZE
-	/* assume installer desires to enlarge fd_set */
-#ifdef HAVE_BITS_TYPES_H
-#include <bits/types.h>
-#endif
-#ifdef	__FD_SETSIZE
-#undef	__FD_SETSIZE
-#define	__FD_SETSIZE OPENLDAP_FD_SETSIZE
-#else
-#define	FD_SETSIZE OPENLDAP_FD_SETSIZE
-#endif
-#endif
+#include "ac/fdset.h"
 
 #include "ldap_cdefs.h"
 #include "ldap_features.h"
-- 
2.39.5