Fix previous commit

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 31b851c62b9adc180e6406f62b7fd21371487a81..bc12b175f47cc20840368c69a4355d9b8a0a7dd6 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -58,6 +58,7 @@
 #   define LIBVLC_USE_PTHREAD 1
 #   define _APPLE_C_SOURCE    1 /* Proper pthread semantics on OSX */
 
+#   include <unistd.h> /* _POSIX_SPIN_LOCKS */
 #   include <pthread.h>
     /* Needed for pthread_cond_timedwait */
 #   include <errno.h>

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index 5eb2ff3834f34e8df16bf5a3bd9240d522ffc95b..a5d8143dec20e8459a7a30006b3f2d2d4284b0e2 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -813,7 +813,7 @@ typedef struct
  */
 static inline int vlc_spin_init (vlc_spinlock_t *spin)
 {
-    return pthread_spin_init (&spin, PTHREAD_PROCESS_PRIVATE);
+    return pthread_spin_init (&spin->spin, PTHREAD_PROCESS_PRIVATE);
 }
 
 /**
@@ -842,7 +842,12 @@ static inline int vlc_spin_destroy (vlc_spinlock_t *spin)
 #else
 /* Fallback to plain mutexes if spinlocks are not available */
 typedef vlc_mutex_t vlc_spinlock_t;
-# define vlc_spin_init    vlc_mutex_init
+
+static inline int vlc_spin_init (vlc_spinlock_t *spin)
+{
+    return vlc_mutex_init (NULL, spin);
+}
+
 # define vlc_spin_lock    vlc_mutex_lock
 # define vlc_spin_unlock  vlc_mutex_unlock
 # define vlc_spin_destroy vlc_mutex_destroy