[Android] threads patch: Remove useless hunk

Rafaël Carré git at videolan.org
Tue Sep 11 00:10:09 CEST 2012


vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Tue Sep 11 00:08:34 2012 +0200| [d5d2050141cab599c554384c6409b3fcd50d6d10] | committer: Rafaël Carré

threads patch: Remove useless hunk

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=d5d2050141cab599c554384c6409b3fcd50d6d10
---

 compile.sh                                 |    2 +-
 patches/0001-android-threads-support.patch |   14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/compile.sh b/compile.sh
index dcb10ff..7968578 100755
--- a/compile.sh
+++ b/compile.sh
@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
 export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=7a216cf
+TESTED_HASH=a597327a
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0001-android-threads-support.patch b/patches/0001-android-threads-support.patch
index 7322c38..acae10c 100644
--- a/patches/0001-android-threads-support.patch
+++ b/patches/0001-android-threads-support.patch
@@ -188,20 +188,6 @@ index 1fc2b67..4bdc7b5 100644
  #if (_POSIX_TIMERS > 0)
  static unsigned vlc_clock_prec;
  
-@@ -141,10 +154,11 @@ void vlc_trace (const char *fn, const char *file, unsigned line)
- 
- static inline unsigned long vlc_threadid (void)
- {
--#if defined (__linux__)
-+#if defined (__ANDROID__)
-+     return syscall (__NR_gettid);
-+#elif defined (__linux__)
-      /* glibc does not provide a call for this */
-      return syscall (SYS_gettid);
--
- #else
-      union { pthread_t th; unsigned long int i; } v = { };
-      v.th = pthread_self ();
 @@ -162,7 +176,7 @@ vlc_thread_fatal (const char *action, int error,
                    const char *function, const char *file, unsigned line)
  {



More information about the Android mailing list