diff options
| author | David Robillard <d@drobilla.net> | 2012-01-08 03:27:33 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-01-08 03:27:33 +0000 |
| commit | 47bdfa160502acc78cb90f350258fe975e4f956f (patch) | |
| tree | d86ba2004cc536dcdac3ca685a3eb5d5ba7284a6 /src | |
| parent | a79fe5a88d0ef9f440fd6b8330a82fb67839fabd (diff) | |
| download | lilv-47bdfa160502acc78cb90f350258fe975e4f956f.tar.gz lilv-47bdfa160502acc78cb90f350258fe975e4f956f.tar.bz2 lilv-47bdfa160502acc78cb90f350258fe975e4f956f.zip | |
Use flock instead of lockf (seems to be more portable).
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3919 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/util.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -15,7 +15,6 @@ */ #define _POSIX_SOURCE 1 /* for wordexp, fileno */ -#define _BSD_SOURCE 1 /* for lockf */ #include <assert.h> #include <errno.h> @@ -28,6 +27,10 @@ #include <sys/types.h> #include <unistd.h> +#if defined(HAVE_FLOCK) && defined(HAVE_FILENO) +# include <sys/file.h> +#endif + #include "lilv_internal.h" #ifdef HAVE_WORDEXP @@ -354,8 +357,8 @@ lilv_path_is_child(const char* path, const char* dir) int lilv_flock(FILE* file, bool lock) { -#if defined(HAVE_LOCKF) && defined(HAVE_FILENO) - return lockf(fileno(file), lock ? F_LOCK : F_ULOCK, 0); +#if defined(HAVE_FLOCK) && defined(HAVE_FILENO) + return flock(fileno(file), lock ? LOCK_EX : LOCK_UN); #else return 0; #endif |