diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-09-23 10:44:45 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-09-23 10:44:45 +0100 |
| commit | b2224947fa697c397b5d3617b6b17e96c4302e6c (patch) | |
| tree | d8ac68782b4d7196405eaf8fc800abcf2e7bec91 | |
| parent | 4d53fd98a67b20527718013ef52f263bf878481c (diff) | |
Solaris doesn't have flock and fcntl is useless so make a no-op flock. Reported
by Dagobert Michelsen.
| -rw-r--r-- | compat.h | 7 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -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 \ |