#if HAVE_CRYPT_H
# include <crypt.h>
#else
- extern char *crypt();
+ extern char *(crypt)();
#endif
#ifndef HAVE_GETPASS
-extern char* getpass LDAP_P((const char *getpass));
+LDAP_F(char*)(getpass) LDAP_P((const char *getpass));
+#else
+LDAP_F(char*)(getpass)();
#endif
/* getopt() defines may be in separate include file */
#endif
#ifndef HAVE_TEMPNAM
- extern char *tempnam(const char *tmpdir, const char *prefix);
+ LDAP_F(char *)(tempnam) LDAP_P((
+ 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)
+ LDAP_F(char *)(mktemp) LDAP_P((char *));
#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 */
-# define NEED_SIMPLE_LOCKING
-# 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 */