Move SETSIZE hack to a header to avoid config.status munging

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/include/ac/fdset.h b/include/ac/fdset.h
new file mode 100644 (file)
index 0000000..45ed424
--- /dev/null
+++ b/include/ac/fdset.h
@@ -0,0 +1,33 @@
+/* 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>.
+ */
+
+#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 5222fd2947ae623c102b8925d67f6fa09bfc2f02..c54a68848dfc06d6c4569fb6d592c04f27d34781 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -1070,18 +1070,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"