X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fac%2Funistd.h;h=a0c0e756b2517281fa5979007a47749828d2413b;hb=ca4764ccfa656cf23658182a60bc3af5a6d91f1a;hp=a52b288417f42b88cb73da13cb9aaaeeb37753cd;hpb=b581bdd23c16761ba6f010c39a153672ba623e50;p=openldap

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index a52b288417..a0c0e756b2 100644
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -1,21 +1,44 @@
 /* Generic unistd.h */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
+ */
 
 #ifndef _AC_UNISTD_H
 #define _AC_UNISTD_H
 
 #if HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#	include <sys/types.h>
 #endif
 
 #if HAVE_UNISTD_H
-# include <unistd.h>
+#	include <unistd.h>
+#endif
+
+#if HAVE_PROCESS_H
+#	include <process.h>
+#endif
+
+/* note: callers of crypt(3) should include <ac/crypt.h> */
+
+#if defined(HAVE_GETPASSPHRASE)
+LDAP_LIBC_F(char*)(getpassphrase)();
+
+#elif defined(HAVE_GETPASS)
+#define getpassphrase(p) getpass(p)
+LDAP_LIBC_F(char*)(getpass)();
+
 #else
-	/* we really should test for these */
-	char *crypt();
-	char *gethostname();
-	char *getenv();
-	long *random();
-	int flock();
+#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 */
@@ -28,17 +51,24 @@
 
 #else
 	/* assume we need to declare these externs */
-	extern char *optarg;
-	extern int optind, opterr, optopt;
+	LDAP_LIBC_V (char *) optarg;
+	LDAP_LIBC_V (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
+/* use lutil file locking */
+#define ldap_lockf(x)	lutil_lockf(x)
+#define ldap_unlockf(x)	lutil_unlockf(x)
+#include <lutil_lockf.h>
 
-/* use _POSIX_VERSION for POSIX.1 code */
+/*
+ * 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 */