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 0162d49ca468876490e72aaa79858fd01be10da1..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,53 +43,18 @@ 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 *);
-#endif
-
-/* Setup file locking macros */
-#if !defined( ldap_lockf ) && HAVE_LOCKF && defined( F_LOCK )
-#      define ldap_lockf(x)    lockf(fileno(x), F_LOCK, 0)
-#      define ldap_unlockf(x)  lockf(fileno(x), F_ULOCK, 0)
+       LIBLUTIL_F(char *)(tempnam) LDAP_P(( const char *tmpdir,
+                                            const char *prefix));
 #endif
 
-#if !defined( ldap_lockf ) && HAVE_FCNTL
-#      ifdef HAVE_FCNTL_H
-#              include <fcntl.h>
-#      endif
-
-#      ifdef F_WRLCK
-#              ifndef  NEED_FCNTL_LOCKING
-#                      define NEED_FCNTL_LOCKING
-#              endif
-#              include <lutil_lockf.h>
-#              define ldap_lockf(x)    lutil_lockf(x)
-#              define ldap_unlockf(x)  lutil_unlockf(x)
-#      endif
-#endif
-
-#if !defined( ldap_lockf ) && HAVE_FLOCK
-#      if HAVE_SYS_FILE_H
-#              include <sys/file.h>
-#      endif
-#      ifdef LOCK_EX
-#              define ldap_lockf(x)    flock(fileno(x), LOCK_EX)
-#              define ldap_unlockf(x)  flock(fileno(x), LOCK_UN)
-#      endif
-#endif
-
-#if !defined( ldap_lockf )
-       /* use some simplistic locking method */
-#      include <lutil_lockf.h>
-#      define ldap_lockf(x)    lutil_lockf(x)
-#      define ldap_unlockf(x)  lutil_unlockf(x)
-#endif
+/* use lutil file locking */
+#define ldap_lockf(x)  lutil_lockf(x)
+#define ldap_unlockf(x)        lutil_unlockf(x)
+#include <lutil_lockf.h>
 
 #endif /* _AC_UNISTD_H */