From b2224947fa697c397b5d3617b6b17e96c4302e6c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 23 Sep 2014 10:44:45 +0100
Subject: [PATCH] Solaris doesn't have flock and fcntl is useless so make a
 no-op flock. Reported by Dagobert Michelsen.

---
 compat.h     | 7 +++++++
 configure.ac | 1 +
 2 files changed, 8 insertions(+)

diff --git a/compat.h b/compat.h
index bf6e5360..2e433a09 100644
--- a/compat.h
+++ b/compat.h
@@ -176,6 +176,13 @@ typedef uint64_t u_int64_t;
 #define TTY_NAME_MAX 32
 #endif
 
+#ifndef HAVE_FLOCK
+#define LOCK_SH 0
+#define LOCK_EX 0
+#define LOCK_NB 0
+#define flock(fd, op) (0)
+#endif
+
 #ifndef HAVE_BZERO
 #undef bzero
 #define bzero(buf, len) memset(buf, 0, len);
diff --git a/configure.ac b/configure.ac
index b524ff8e..fc71f02a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,6 +386,7 @@ AC_CHECK_FUNCS(
 	[ \
 		bzero \
 		dirfd \
+		flock \
 		setproctitle \
 		sysconf \
 		cfmakeraw \