Mercurial > audlegacy
changeset 3801:701de882bcc2 trunk
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 14 Sep 2007 08:10:29 +0300 |
| parents | 5dc0aaa97966 (current diff) fb5bc40d0b86 (diff) |
| children | fe3a1ae77f80 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/tuple.c Fri Sep 14 06:29:33 2007 +0300 +++ b/src/audacious/tuple.c Fri Sep 14 08:10:29 2007 +0300 @@ -65,7 +65,6 @@ # define TUPLE_UNLOCK_WRITE(XX) { TUPDEB("UNLOCK_WRITE"); g_static_rw_lock_writer_unlock(&tuple_rwlock); } # define TUPLE_LOCK_READ(XX) { TUPDEB("LOCK_READ"); g_static_rw_lock_reader_lock(&tuple_rwlock); } # define TUPLE_UNLOCK_READ(XX) { TUPDEB("UNLOCK_READ"); g_static_rw_lock_reader_unlock(&tuple_rwlock); } -# undef TUPDEP # else # define TUPLE_LOCK_WRITE(XX) g_static_rw_lock_writer_lock(&tuple_rwlock) # define TUPLE_UNLOCK_WRITE(XX) g_static_rw_lock_writer_unlock(&tuple_rwlock)