Merge OPENLDAP_FD_SETSIZE fix from HEAD

diff --git a/CHANGES b/CHANGES
index 8bc7d643b3ef34c0c650e2e54486c3a7475d5bf9..a5a6d2abbb2c906e41d5b47219674a2820bd46e2 100644 (file)
--- 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 ab65e5b726512ee6b826ff22daf55ba4697068bf..f6f86c05c9c1d3d2449c33d5dbb28a3d9f418275 100644 (file)
--- 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 d6c2e4eb441cd2d65314afe200d40317e07d381c..2c151a83bd43da34ee29b0c14ed5efff86846e8b 100755 (executable)
--- 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 (file)
index 0000000..994828e
--- /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 bae833ed620e1eec801c1ed6cb6a3091f787b189..153251648a1182817f77a4a908df55e9431329d4 100644 (file)
--- 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"