From 3bedf8846f4d7a5cb38276b274662d62a36dcd52 Mon Sep 17 00:00:00 2001
From: Martin Ebourne <martin@ebourne.me.uk>
Date: Mon, 12 Dec 2005 20:50:00 +0000
Subject: Marged chris/win32/merge/07-win32-fixes at r210 to trunk

---
 lib/common/NamedLock.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/common/NamedLock.cpp')

diff --git a/lib/common/NamedLock.cpp b/lib/common/NamedLock.cpp
index b9aeb768..fc7b8309 100755
--- a/lib/common/NamedLock.cpp
+++ b/lib/common/NamedLock.cpp
@@ -105,7 +105,7 @@ bool NamedLock::TryAndGetLock(const char *Filename, int mode)
 			THROW_EXCEPTION(CommonException, OSFileError)
 		}
 	}
-#else
+#elif HAVE_DECL_F_SETLK
 	struct flock desc;
 	desc.l_type = F_WRLCK;
 	desc.l_whence = SEEK_SET;
-- 
cgit v1.2.3