Check for the availability of flock().

diff --git a/configure.ac b/configure.ac
index 022bba7bb817b296b7a61358da89d24c06c94c59..f349de194ba4cc1091b095887c20e45c69973d7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ MeshLink_ATTRIBUTE(__malloc__)
 MeshLink_ATTRIBUTE(__warn_unused_result__)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random pselect select setns strdup usleep getifaddrs freeifaddrs],
+AC_CHECK_FUNCS([asprintf fchmod flock fork gettimeofday random pselect select setns strdup usleep getifaddrs freeifaddrs],
   [], [], [#include "$srcdir/src/have.h"]
 )
 

diff --git a/src/conf.c b/src/conf.c
index 6ceb23c5ed3e90f15c57851b3213155ed854554e..cae7bd1e90de73c44e4db0acc0677acd7705c2ab 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -483,9 +483,7 @@ bool main_config_lock(meshlink_handle_t *mesh, const char *lock_filename) {
        fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
 #endif
 
-#ifdef HAVE_MINGW
-       // TODO: use _locking()?
-#else
+#ifdef HAVE_FLOCK
 
        if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
                logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", lock_filename, strerror(errno));