From b1c91c8e27b4192cebac33c258c36320ad7740a7 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Feb 2009 23:20:56 +0000
Subject: [PATCH] Updated patch for vlc-0.8.6i on Haiku, this one gets a bit
 further, but still not linking, this time with functions in threads.c not
 commented out.

---
 media-video/vlc/vlc-0.8.6i-haiku.diff | 34 ++++-----------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/media-video/vlc/vlc-0.8.6i-haiku.diff b/media-video/vlc/vlc-0.8.6i-haiku.diff
index dfd9c4cc2..e0c6c6dda 100644
--- a/media-video/vlc/vlc-0.8.6i-haiku.diff
+++ b/media-video/vlc/vlc-0.8.6i-haiku.diff
@@ -253,52 +253,28 @@ diff -urN vlc-0.8.6i/src/input/input.c vlc-0.8.6i-haiku/src/input/input.c
                  for( j = 0; j < tk->i_meta; j++ )
 diff -urN vlc-0.8.6i/src/misc/threads.c vlc-0.8.6i-haiku/src/misc/threads.c
 --- vlc-0.8.6i/src/misc/threads.c	2009-02-18 15:15:12.000000000 +0000
-+++ vlc-0.8.6i-haiku/src/misc/threads.c	2009-02-21 18:45:41.000000000 +0000
-@@ -524,7 +524,7 @@
- {
-     int i_ret;
-     void *p_data = (void *)p_this;
--
-+/*
-     vlc_mutex_lock( &p_this->object_lock );
- 
- #if defined( PTH_INIT_IN_PTH_H )
-@@ -538,10 +538,11 @@
- #elif defined( WIN32 ) || defined( UNDER_CE )
-     {
-         unsigned threadID;
--        /* When using the MSVCRT C library you have to use the _beginthreadex
-+*/        /* When using the MSVCRT C library you have to use the _beginthreadex
++++ vlc-0.8.6i-haiku/src/misc/threads.c	2009-02-21 23:12:06.000000000 +0000
+@@ -542,6 +542,7 @@
           * function instead of CreateThread, otherwise you'll end up with
           * memory leaks and the signal functions not working (see Microsoft
           * Knowledge Base, article 104641) */
-+/*
++
          p_this->thread_id =
  #if defined( UNDER_CE )
                  (HANDLE)CreateThread( NULL, 0, (PTHREAD_START) func,
-@@ -636,7 +637,7 @@
+@@ -636,7 +637,6 @@
                           psz_name, psz_file, i_line, strerror(i_ret) );
          vlc_mutex_unlock( &p_this->object_lock );
      }
 -
-+*/
      return i_ret;
  }
  
-@@ -647,6 +648,7 @@
- int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file,
-                                int i_line, int i_priority )
- {
-+/*
- #if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
- #elif defined( WIN32 ) || defined( UNDER_CE )
-     if( !SetThreadPriority(GetCurrentThread(), i_priority) )
-@@ -689,7 +691,7 @@
+@@ -689,7 +689,6 @@
          }
      }
  #endif
 -
-+*/
      return 0;
  }