Sync with HEAD

[openldap] / include / ac / unistd.h

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 7f7476a55d30d74cd8cead43a25a9ed1995196ae..a266dd83e26b5438e368ec7d4a188caa4ea0c412 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -1,13 +1,17 @@
 /* Generic unistd.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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_UNISTD_H
@@ -27,10 +31,17 @@
 
 /* note: callers of crypt(3) should include <ac/crypt.h> */
 
-#ifndef HAVE_GETPASS
-LIBLUTIL_F(char*)(getpass) LDAP_P((const char *getpass));
+#if defined(HAVE_GETPASSPHRASE)
+LDAP_LIBC_F(char*)(getpassphrase)();
+
+#elif defined(HAVE_GETPASS)
+#define getpassphrase(p) getpass(p)
+LDAP_LIBC_F(char*)(getpass)();
+
 #else
-LIBC_F(char*)(getpass)();
+#define NEED_GETPASSPHRASE 1
+#define getpassphrase(p) lutil_getpass(p)
+LDAP_LUTIL_F(char*)(lutil_getpass) LDAP_P((const char *getpass));
 #endif
 
 /* getopt() defines may be in separate include file */
@@ -43,13 +54,8 @@ LIBC_F(char*)(getpass)();
 
 #else
        /* assume we need to declare these externs */
-       LIBC_F (char *) optarg;
-       LIBC_F (int) optind, opterr, optopt;
-#endif
-
-#ifndef HAVE_TEMPNAM
-       LIBLUTIL_F(char *)(tempnam) LDAP_P(( const char *tmpdir,
-                                            const char *prefix));
+       LDAP_LIBC_V (char *) optarg;
+       LDAP_LIBC_V (int) optind, opterr, optopt;
 #endif
 
 /* use lutil file locking */
@@ -57,4 +63,15 @@ LIBC_F(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 */