diff options
author | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-06-25 12:28:16 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-06-29 17:41:57 +0200 |
commit | bce211e41687f234f8c03fd6e4fd7490a0e0b7e2 (patch) | |
tree | 12308b58ad4e67ff169640e8d82794c7b4da37d5 | |
parent | 6f447928066626e747df8f32485e71c393119a79 (diff) |
Rename the flock variable to f_lock.
flock() is a function on FreeBSD, and the variable shadowed its definition.
-rw-r--r-- | src/pulsecore/core-util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 6c94a71d..95111420 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -1193,22 +1193,22 @@ int pa_check_in_group(gid_t g) { (advisory on UNIX, mandatory on Windows) */ int pa_lock_fd(int fd, int b) { #ifdef F_SETLKW - struct flock flock; + struct flock f_lock; /* Try a R/W lock first */ - flock.l_type = (short) (b ? F_WRLCK : F_UNLCK); - flock.l_whence = SEEK_SET; - flock.l_start = 0; - flock.l_len = 0; + f_lock.l_type = (short) (b ? F_WRLCK : F_UNLCK); + f_lock.l_whence = SEEK_SET; + f_lock.l_start = 0; + f_lock.l_len = 0; - if (fcntl(fd, F_SETLKW, &flock) >= 0) + if (fcntl(fd, F_SETLKW, &f_lock) >= 0) return 0; /* Perhaps the file descriptor qas opened for read only, than try again with a read lock. */ if (b && errno == EBADF) { - flock.l_type = F_RDLCK; - if (fcntl(fd, F_SETLKW, &flock) >= 0) + f_lock.l_type = F_RDLCK; + if (fcntl(fd, F_SETLKW, &f_lock) >= 0) return 0; } |