Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblutil / lockf.c

diff --git a/libraries/liblutil/lockf.c b/libraries/liblutil/lockf.c
index c932deed7fc84d5bf04cb8087034f7873377849c..6119721a5f161ea74dec96c1bd16175b1f15f99d 100644 (file)
--- a/libraries/liblutil/lockf.c
+++ b/libraries/liblutil/lockf.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,12 +33,12 @@
 
 #undef LOCK_API
 
-#if HAVE_LOCKF && defined(F_LOCK)
+#if defined(HAVE_LOCKF) && defined(F_LOCK)
 #      define USE_LOCKF 1
 #      define LOCK_API "lockf"
 #endif
 
-#if !defined(LOCK_API) && HAVE_FCNTL
+#if !defined(LOCK_API) && defined(HAVE_FCNTL)
 #      ifdef HAVE_FCNTL_H
 #              include <fcntl.h>
 #      endif
@@ -48,8 +48,8 @@
 #      endif
 #endif
 
-#if !defined(LOCK_API) && HAVE_FLOCK
-#      if HAVE_SYS_FILE_H
+#if !defined(LOCK_API) && defined(HAVE_FLOCK)
+#      ifdef HAVE_SYS_FILE_H
 #              include <sys/file.h>
 #      endif
 #      define USE_FLOCK 1