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 d62d3b86bde7dc8331091c13d7efc67d80001a30..ee7b3aa3637e5c13966909148f10f544ccfcf4bf 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -21,21 +21,16 @@
 #      include <unistd.h>
 #endif
 
-/* note: callers of crypt(3) should include <ac/crypt.h> */
-
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLUTIL_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
+#if HAVE_PROCESS_H
+#      include <process.h>
 #endif
 
+/* note: callers of crypt(3) should include <ac/crypt.h> */
+
 #ifndef HAVE_GETPASS
-LDAP_F(char*)(getpass) LDAP_P((const char *getpass));
+LIBLUTIL_F(char*)(getpass) LDAP_P((const char *getpass));
 #else
-LDAP_F(char*)(getpass)();
+LIBC_F(char*)(getpass)();
 #endif
 
 /* getopt() defines may be in separate include file */
@@ -48,21 +43,13 @@ LDAP_F(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
-       LDAP_F(char *)(tempnam) LDAP_P((
-               const char *tmpdir,
-               const char *prefix));
-#endif
-
-/* This is never even checked for or implemented if not present */
-#if 0
-#ifndef HAVE_MKTEMP
-       LDAP_F(char *)(mktemp) LDAP_P((char *));
-#endif
+       LIBLUTIL_F(char *)(tempnam) LDAP_P(( const char *tmpdir,
+                                            const char *prefix));
 #endif
 
 /* use lutil file locking */