Move Windows sleep macro from acconfig.h to ac/unistd.h

diff --git a/acconfig.h b/acconfig.h
index 7e6de552ee56a997024557d8040d23011c196a6d..7da3594d4c1d3586674d11112f4ea62d75d5e964 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -77,8 +77,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/include/ac/unistd.h b/include/ac/unistd.h
index 49236f8265edf171aa5fcece4e3e2ef0f6b53ee2..f92f28f0b1fc877273bf63dac826b5bb6b104be1 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -60,4 +60,15 @@ LDAP_LUTIL_F(char*)(lutil_getpass) LDAP_P((const char *getpass));
 #define ldap_unlockf(x)        lutil_unlockf(x)
 #include <lutil_lockf.h>
 
+/*
+ * Windows: although sleep() will be resolved by both MSVC and Mingw GCC
+ * linkers, the function is not declared in header files. This is
+ * because Windows' version of the function is called _sleep(), and it
+ * is declared in stdlib.h
+ */
+
+#ifdef _WIN32
+#define sleep _sleep
+#endif
+
 #endif /* _AC_UNISTD_H */