update Win32 build environment to support back-sql

[openldap] / include / ac / unistd.h

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 61ad9172b18043a2ee8a7025286901de09b4a5e2..ee7b3aa3637e5c13966909148f10f544ccfcf4bf 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -1,4 +1,5 @@
 /* Generic unistd.h */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
@@ -20,15 +21,16 @@
 #      include <unistd.h>
 #endif
 
-/* crypt() may be defined in a separate include file */
-#if HAVE_CRYPT_H
-#      include <crypt.h>
-#else
-       extern char *crypt();
+#if HAVE_PROCESS_H
+#      include <process.h>
 #endif
 
+/* note: callers of crypt(3) should include <ac/crypt.h> */
+
 #ifndef HAVE_GETPASS
-extern char* getpass LDAP_P((const char *getpass));
+LIBLUTIL_F(char*)(getpass) LDAP_P((const char *getpass));
+#else
+LIBC_F(char*)(getpass)();
 #endif
 
 /* getopt() defines may be in separate include file */
@@ -41,15 +43,13 @@ extern char* getpass LDAP_P((const char *getpass));
 
 #else
        /* assume we need to declare these externs */
-       extern char *optarg;
-       extern int optind, opterr, optopt;
+       LIBC_F (char *) optarg;
+       LIBC_F (int) optind, opterr, optopt;
 #endif
 
 #ifndef HAVE_TEMPNAM
-       extern char *tempnam(const char *tmpdir, const char *prefix);
-#endif
-#ifndef HAVE_MKTEMP
-       extern char *mktemp(char *);
+       LIBLUTIL_F(char *)(tempnam) LDAP_P(( const char *tmpdir,
+                                            const char *prefix));
 #endif
 
 /* use lutil file locking */