If we are using lutil_lock functions then define NEED_SIMPLE_LOCKING or

[openldap] / libraries / liblutil / lockf.c

diff --git a/libraries/liblutil/lockf.c b/libraries/liblutil/lockf.c
index 7f0d569f816bc9d0eae6e46f6cc97032a8739d85..13226bbf590471e6ef9fea5dd1ca97b75e2d8c29 100644 (file)
--- a/libraries/liblutil/lockf.c
+++ b/libraries/liblutil/lockf.c
@@ -7,35 +7,33 @@
  * license is available at http://www.OpenLDAP.org/license.html or
  * in file LICENSE in the top-level directory of the distribution.
  */
-/* File locking methods */
+/* Simple file locking method for systems without */
 
 #include "portable.h"
 
 #include <stdio.h>
 #include <ac/unistd.h>
 
-#if defined(NEED_FCNTL_LOCKING) && defined(HAVE_FCNTL_H)
+#ifdef NEED_SIMPLE_LOCKING
 
-#include <fcntl.h>
-
-int lutil_ldap_lockf ( FILE *fs ) {
+int lutil_lockf ( FILE *fp ) {
        struct flock file_lock;
        memset( &file_lock, 0, sizeof( file_lock ) );
        file_lock.l_type = F_WRLCK;
        file_lock.l_whence = SEEK_SET;
        file_lock.l_start = 0;
        file_lock.l_len = 0;
-       return( fcntl( fileno( fs ), F_SETLKW, &file_lock ) );
+       return( fcntl( fileno(fp), F_SETLKW, &file_lock ) );
 }
 
-int lutil_ldap_unlockf ( FILE *fs ) {
+int lutil_unlockf ( FILE *fp ) {
        struct flock file_lock;
        memset( &file_lock, 0, sizeof( file_lock ) );
        file_lock.l_type = F_UNLCK;
        file_lock.l_whence = SEEK_SET;
        file_lock.l_start = 0;
        file_lock.l_len = 0;
-       return ( fcntl( fileno( fs ), F_SETLK, &file_lock ) );
+       return ( fcntl( fileno(fp), F_SETLK, &file_lock ) );
 }
 
-#endif /* !HAVE_FILE_LOCKING */
+#endif /* NEED_SIMPLE_LOCKING */