Regenerate configure and fix AC header inclusion

diff --git a/include/portable.h.in b/include/portable.h.in
index b064946c57152c1299eebec8e1c94984a3c89004..067f815767f53d58becd1cbc274e9036cbc209bf 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -991,8 +991,6 @@
 #ifdef _WIN32
        /* don't suck in all of the win32 api */
 #      define WIN32_LEAN_AND_MEAN 1
-
-#      define sleep _sleep
 #endif
 
 #ifndef LDAP_NEEDS_PROTOTYPES

diff --git a/libraries/libldap_r/threads.c b/libraries/libldap_r/threads.c
index e14fdb1e2c47f6ce1945c630c0fef811b1d569ce..9591bcdc06b3401cb8be10c7bc2be4fdd995e205 100644 (file)
--- a/libraries/libldap_r/threads.c
+++ b/libraries/libldap_r/threads.c
@@ -12,8 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdarg.h>
 
+#include <ac/stdarg.h>
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>

diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c
index 3243ac133ae1f4afc2a15009fcd901a2bf25b8fa..6d014d70ff0dc58ca36ca61c490df9c00c762582 100644 (file)
--- a/libraries/libldap_r/tpool.c
+++ b/libraries/libldap_r/tpool.c
@@ -12,8 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdarg.h>
 
+#include <ac/stdarg.h>
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c
index 97772bfcc8dc5a902146e6a545594ee5d5612155..4143654e66e6f2efc0886520c3e7310b43def9ff 100644 (file)
--- a/servers/slapd/back-ldbm/nextid.c
+++ b/servers/slapd/back-ldbm/nextid.c
@@ -11,10 +11,7 @@
 
 #include <ac/string.h>
 #include <ac/socket.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+#include <ac/param.h>
 
 #include "slap.h"
 #include "back-ldbm.h"