# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1188938702 0
# Node ID 91056492b156839bb610a64d677f2c1182e4f663
# Parent  53f1775eabe4ee3918be97a75396a0ace97d63a0
Fix XS_MUTEX_DEBUG to work again.


diff -r 53f1775eabe4 -r 91056492b156 src/xmms-sid.h
--- a/src/xmms-sid.h	Tue Sep 04 16:21:01 2007 +0000
+++ b/src/xmms-sid.h	Tue Sep 04 20:45:02 2007 +0000
@@ -24,7 +24,6 @@
 #define XMMS_SID_H
 
 #include "xs_support.h"
-#include <pthread.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -107,9 +106,12 @@
 #define XS_THREAD_EXIT(M)	pthread_exit(M)
 #define XS_THREAD_JOIN(M)	pthread_join(M, NULL)
 #define XS_MPP(M)		M ## _mutex
-#if XS_MUTEX_DEBUG
-#  define XS_MUTEX(M)		pthread_mutex_t	XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; int M ## _qq;
-#  define XS_MUTEX_H(M)		extern pthread_mutex_t XS_MPP(M); extern int M ## _qq
+#ifdef XS_MUTEX_DEBUG
+#  ifndef __USE_GNU
+#    define __USE_GNU
+#  endif
+#  define XS_MUTEX(M)		pthread_mutex_t	XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; gint M ## _qq
+#  define XS_MUTEX_H(M)		extern pthread_mutex_t XS_MPP(M); extern gint M ## _qq
 #  define XS_MUTEX_LOCK(M)	{ M ## _qq = pthread_mutex_lock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_LOCK(" #M ") == %i\n", M ## _qq); }
 #  define XS_MUTEX_UNLOCK(M)	{ M ## _qq = pthread_mutex_unlock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_UNLOCK(" #M ") == %i\n", M ## _qq); }
 #else
@@ -118,6 +120,7 @@
 #  define XS_MUTEX_LOCK(M)	pthread_mutex_lock(&XS_MPP(M))
 #  define XS_MUTEX_UNLOCK(M)	pthread_mutex_unlock(&XS_MPP(M))
 #endif
+#include <pthread.h>
 
 /* Character set conversion helper macros
  */