# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189746629 -10800
# Node ID 701de882bcc20bb9dd15b95ba0b29ea16fc94ab0
# Parent  5dc0aaa9796601ffcc823bd9a59c6c03e6dd0af7# Parent  fb5bc40d0b867239468a3723f282e16225e14bc3
Automated merge with file:/home/ccr/audacious/core

diff -r 5dc0aaa97966 -r 701de882bcc2 src/audacious/tuple.c
--- 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)