Commit 023b62e4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by ivoire
Browse files

Update patches for latest vlc.git


Signed-off-by: ivoire's avatarRémi Duraffort <ivoire@videolan.org>
parent b153465b
From d2bde846c6226bbbc07cbb96eebf48eb4511f9d5 Mon Sep 17 00:00:00 2001
From 008d9315aeb6a7a032179a08621af674f70736ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Andr=C3=A9?= <jpeg@videolan.org>
Date: Thu, 2 Jun 2011 15:15:57 +0200
Subject: [PATCH 1/8] Android: add compatibility pthread_cancel
......@@ -18,8 +18,8 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac | 4 +
include/vlc_fixups.h | 22 ++++
src/control/error.c | 16 +++
src/posix/thread.c | 20 ++++
5 files changed, 353 insertions(+), 0 deletions(-)
src/posix/thread.c | 21 ++++
5 files changed, 354 insertions(+), 0 deletions(-)
create mode 100644 compat/pthread_cancel.c
diff --git a/compat/pthread_cancel.c b/compat/pthread_cancel.c
......@@ -320,10 +320,10 @@ index 0000000..8a39f5d
+ return ret;
+}
diff --git a/configure.ac b/configure.ac
index ccc77f9..574f7f2 100644
index 3d87a9b..ffcb057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,6 +530,10 @@ if test "${SYS}" = "mingw32" -a "${CXX}" != "" ; then
@@ -532,6 +532,10 @@ if test "${SYS}" = "mingw32" -a "${CXX}" != "" ; then
AC_LANG_POP(C++)
fi
......@@ -335,10 +335,10 @@ index ccc77f9..574f7f2 100644
dnl Buggy glibc prevention. Purposedly not cached.
dnl See sourceware.org bugs 5058 and 5443.
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c694578..35c526c 100644
index a223384..5fcd0d6 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -342,6 +342,28 @@ long nrand48 (unsigned short subi[3]);
@@ -337,6 +337,28 @@ long nrand48 (unsigned short subi[3]);
# undef __cplusplus
# endif
char *tempnam(const char *, const char *);
......@@ -409,10 +409,10 @@ index e3f7051..f6827e7 100644
vlc_mutex_unlock (&lock);
}
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 561f93a..64b4fd3 100644
index 966c74c..9618fa5 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -371,7 +371,11 @@ void vlc_cond_broadcast (vlc_cond_t *p_condvar)
@@ -435,7 +435,11 @@ void vlc_cond_broadcast (vlc_cond_t *p_condvar)
*/
void vlc_cond_wait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex)
{
......@@ -424,10 +424,11 @@ index 561f93a..64b4fd3 100644
VLC_THREAD_ASSERT ("waiting on condition");
}
@@ -411,7 +415,11 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
#else
lldiv_t d = lldiv( deadline, CLOCK_FREQ );
struct timespec ts = { d.quot, d.rem * (1000000000 / CLOCK_FREQ) };
@@ -472,7 +476,12 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
#endif
struct timespec ts = mtime_to_ts (deadline);
+
+#ifdef __ANDROID__
+ int val = pthread_cond_timedwait_cancel (p_condvar, p_mutex, &ts);
+#else
......@@ -436,7 +437,7 @@ index 561f93a..64b4fd3 100644
if (val != ETIMEDOUT)
VLC_THREAD_ASSERT ("timed-waiting on condition");
return val;
@@ -451,6 +459,14 @@ void vlc_sem_destroy (vlc_sem_t *sem)
@@ -511,6 +520,14 @@ void vlc_sem_destroy (vlc_sem_t *sem)
val = errno;
#endif
......@@ -451,7 +452,7 @@ index 561f93a..64b4fd3 100644
VLC_THREAD_ASSERT ("destroying semaphore");
}
@@ -681,7 +697,11 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr,
@@ -741,7 +758,11 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr,
assert (ret == 0); /* fails iif VLC_STACKSIZE is invalid */
#endif
......@@ -464,5 +465,5 @@ index 561f93a..64b4fd3 100644
pthread_attr_destroy (attr);
return ret;
--
1.7.5.4
1.7.6
From 4b79837c2975a6351d0a33a205a29af6d86571a9 Mon Sep 17 00:00:00 2001
From fbdf604a30a47fdc733378e1339f4bd0ac71cf46 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Thu, 2 Jun 2011 12:50:50 +0200
Subject: [PATCH 2/8] Android: use a custom poll(), fixes HTTP playback
......@@ -10,10 +10,10 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 35c526c..c86fc3d 100644
index 5fcd0d6..d00fa21 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -276,7 +276,7 @@ struct pollfd
@@ -271,7 +271,7 @@ struct pollfd
};
# define poll(a, b, c) vlc_poll(a, b, c)
......@@ -105,5 +105,5 @@ index c1ca900..46ec3b5 100644
# include <vlc_network.h>
--
1.7.5.4
1.7.6
From 175be1f8d5cb3189d466e48e016676d7d1973ea0 Mon Sep 17 00:00:00 2001
From 64659724f9d7c8edb964488806f817c5651ff37f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 10 Jun 2011 16:48:26 +0200
Subject: [PATCH 3/8] No dtv on Android
......@@ -29,5 +29,5 @@ index 3183db7..7578d88 100644
if HAVE_WIN32
# Work-around automake bug:
--
1.7.5.4
1.7.6
From 07a7da99d5c2d1fa34a389c389c2a58753a46c5c Mon Sep 17 00:00:00 2001
From e7954be97f9104f59c2f5eaa28cbe5ad0fc3066c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 4 Jul 2011 15:52:19 +0200
Date: Sun, 31 Jul 2011 00:20:40 +0200
Subject: [PATCH 4/8] Push messages to Android stack
---
......@@ -10,10 +10,10 @@ Subject: [PATCH 4/8] Push messages to Android stack
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 574f7f2..096bf97 100644
index ffcb057..6f302d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -532,6 +532,7 @@ fi
@@ -534,6 +534,7 @@ fi
if test "${HAVE_ANDROID}" = "1"; then
AC_REPLACE_FUNCS([pthread_cancel])
......@@ -68,12 +68,12 @@ index 188d763..96f570a 100644
#if defined (WIN32) || defined (__OS2__)
fflush (stream);
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 64b4fd3..6bc07bf 100644
index 9618fa5..d944fff 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -67,6 +67,14 @@
#endif
@@ -136,6 +136,14 @@ static struct timespec mtime_to_ts (mtime_t date)
return ts;
}
+#if defined(__ANDROID__) && !defined(NDEBUG)
+# include <android/log.h>
......@@ -86,7 +86,7 @@ index 64b4fd3..6bc07bf 100644
/**
* Print a backtrace to the standard error for debugging purpose.
*/
@@ -107,8 +115,8 @@ vlc_thread_fatal (const char *action, int error,
@@ -176,8 +184,8 @@ vlc_thread_fatal (const char *action, int error,
const char *function, const char *file, unsigned line)
{
int canc = vlc_savecancel ();
......@@ -97,7 +97,7 @@ index 64b4fd3..6bc07bf 100644
vlc_trace (function, file, line);
/* Sometimes strerror_r() crashes too, so make sure we print an error
@@ -116,7 +124,7 @@ vlc_thread_fatal (const char *action, int error,
@@ -185,7 +193,7 @@ vlc_thread_fatal (const char *action, int error,
#ifdef __GLIBC__
/* Avoid the strerror_r() prototype brain damage in glibc */
errno = error;
......@@ -106,7 +106,7 @@ index 64b4fd3..6bc07bf 100644
#else
char buf[1000];
const char *msg;
@@ -133,7 +141,7 @@ vlc_thread_fatal (const char *action, int error,
@@ -202,7 +210,7 @@ vlc_thread_fatal (const char *action, int error,
msg = "unknown (invalid error number)";
break;
}
......@@ -116,5 +116,5 @@ index 64b4fd3..6bc07bf 100644
fflush (stderr);
--
1.7.5.4
1.7.6
From 01338cc97dc9e2ef4119321330397a01b312b424 Mon Sep 17 00:00:00 2001
From 1de0f81a2e6d14bbd9f2ece949c25f678bd7f121 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 6 Jul 2011 00:16:58 +0200
Subject: [PATCH 5/8] Revert "Move common predefined macros to config.h and
common.am"
This reverts commit 7af4b7fed74f000a0145547a301d67314df977d3.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
configure.ac | 6 +-----
modules/common.am | 1 -
......@@ -14,10 +16,10 @@ This reverts commit 7af4b7fed74f000a0145547a301d67314df977d3.
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 096bf97..79063a5 100644
index 6f302d2..a9865ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,11 +57,7 @@ dnl Check for tools
@@ -59,11 +59,7 @@ dnl Check for tools
dnl
AC_PROG_CC_C99
AC_USE_SYSTEM_EXTENSIONS
......@@ -31,7 +33,7 @@ index 096bf97..79063a5 100644
AM_PROG_CC_C_O
AC_PROG_CXX
diff --git a/modules/common.am b/modules/common.am
index fc29eae..1092b62 100644
index 5cecb18..760ac33 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -13,7 +13,6 @@ CLEANFILES = $(BUILT_SOURCES)
......@@ -103,5 +105,5 @@ index 502b61f..2b649c8 100644
*)
module="$tgt"
--
1.7.5.4
1.7.6
From 4b5430f3b44e5571c69d616a14af1263fd462844 Mon Sep 17 00:00:00 2001
From 72d782188f36685955692831e2542dcd21e4e89e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 6 Jul 2011 00:18:31 +0200
Subject: [PATCH 6/8] Revert "Remove ugly builtin support"
This reverts commit 473a276fdd990c75efe1106a8c7b2de18200df59.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
configure.ac | 24 ++++++++++++++++++++----
include/vlc/libvlc.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -17,10 +19,10 @@ This reverts commit 473a276fdd990c75efe1106a8c7b2de18200df59.
9 files changed, 83 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 79063a5..f572e79 100644
index a9865ae..5d84e06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,26 @@ AS_IF([test -n "${with_binary_version}"],[
@@ -96,6 +96,26 @@ AS_IF([test -n "${with_binary_version}"],[
[Binary specific version])
])
......@@ -47,7 +49,7 @@ index 79063a5..f572e79 100644
dnl
dnl Check for the contrib directory
dnl
@@ -440,10 +460,6 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
@@ -442,10 +462,6 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
lt_cv_deplibs_check_method=pass_all
......@@ -59,7 +61,7 @@ index 79063a5..f572e79 100644
dnl Gettext stuff
dnl
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index bcf9bdc..a5c70d2 100644
index da4d23d..c99e6bf 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -137,6 +137,41 @@ const char *libvlc_printerr (const char *fmt, ...);
......@@ -105,10 +107,10 @@ index bcf9bdc..a5c70d2 100644
* Decrement the reference count of a libvlc instance, and destroy it
* if it reaches zero.
diff --git a/modules/common.am b/modules/common.am
index 1092b62..f001a7f 100644
index 760ac33..44765b5 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -13,17 +13,17 @@ CLEANFILES = $(BUILT_SOURCES)
@@ -13,16 +13,16 @@ CLEANFILES = $(BUILT_SOURCES)
LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
......@@ -122,7 +124,6 @@ index 1092b62..f001a7f 100644
-avoid-version -module \
-export-symbols-regex ^vlc_entry \
-shrext $(LIBEXT) \
-rpath "$(libvlcdir)" \
-no-undefined \
- `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
......@@ -132,7 +133,7 @@ index 1092b62..f001a7f 100644
include $(srcdir)/Modules.am
diff --git a/src/control/core.c b/src/control/core.c
index d5836be..3936302 100644
index 2834af1..c627c0a 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -38,7 +38,8 @@
......@@ -181,7 +182,7 @@ index 076c614..b522ef7 100644
VLC_API void libvlc_InternalDestroy( libvlc_int_t * );
diff --git a/src/libvlc.c b/src/libvlc.c
index 3747032..753e347 100644
index 4a90f9a..b3fceb3 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -249,7 +249,7 @@ error:
......@@ -258,5 +259,5 @@ index fd2e31d..afe3955 100644
#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
--
1.7.5.4
1.7.6
From 73065265f535b1494cbc5b8cdde45b9907339fc2 Mon Sep 17 00:00:00 2001
From 62bd39011a43acc8e05b24cc2c50ca20cf1bcbec Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 7 Jul 2011 01:05:09 +0200
Date: Sun, 31 Jul 2011 00:05:21 +0200
Subject: [PATCH 7/8] Old contribs: compile live on Android
---
extras/contrib/src/Patches/live-android.patch | 56 +++++++++++++++++++++++
extras/contrib/src/Patches/live-uselocale.patch | 32 ++++++-------
extras/contrib/src/contrib-src.mak | 3 +
3 files changed, 74 insertions(+), 17 deletions(-)
extras/contrib/src/Patches/live-android.patch | 67 +++++++++++++++++++++++++
extras/contrib/src/contrib-src.mak | 3 +
2 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644 extras/contrib/src/Patches/live-android.patch
diff --git a/extras/contrib/src/Patches/live-android.patch b/extras/contrib/src/Patches/live-android.patch
new file mode 100644
index 0000000..722bb01
index 0000000..315610a
--- /dev/null
+++ b/extras/contrib/src/Patches/live-android.patch
@@ -0,0 +1,56 @@
@@ -0,0 +1,67 @@
+diff -ruN live/Makefile.tail live.new/Makefile.tail
+--- live/Makefile.tail 2011-03-15 08:40:37.000000000 +0900
++++ live.new/Makefile.tail 2011-04-13 17:20:54.238795233 +0900
......@@ -72,81 +71,17 @@ index 0000000..722bb01
+ if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP,
+ (const char*)&imr, sizeof (struct ip_mreq_source)) < 0) {
+ return False;
diff --git a/extras/contrib/src/Patches/live-uselocale.patch b/extras/contrib/src/Patches/live-uselocale.patch
index 0b56063..af36cfa 100644
--- a/extras/contrib/src/Patches/live-uselocale.patch
+++ b/extras/contrib/src/Patches/live-uselocale.patch
@@ -1,8 +1,6 @@
-Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
-Licensed under GNU General Public License version 2 or higher.
-diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
---- live.orig/liveMedia/include/Locale.hh 2009-03-23 01:26:16 +0300
-+++ live/liveMedia/include/Locale.hh 2009-03-26 19:17:43 +0300
+diff -ruN live/liveMedia/include/Locale.hh live.new/liveMedia/include/Locale.hh
+--- live/liveMedia/include/Locale.hh 2011-07-06 21:18:43.000000000 +0200
++++ live.new/liveMedia/include/Locale.hh 2011-07-07 01:07:09.881034659 +0200
@@ -27,23 +27,26 @@
#ifndef LOCALE_NOT_USED
@@ -37,9 +35,9 @@ diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
};
#endif
-diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
---- live.orig/liveMedia/Locale.cpp 2009-03-23 01:26:16 +0300
-+++ live/liveMedia/Locale.cpp 2009-03-26 19:17:43 +0300
+diff -ruN live/liveMedia/Locale.cpp live.new/liveMedia/Locale.cpp
+--- live/liveMedia/Locale.cpp 2011-07-06 21:18:44.000000000 +0200
++++ live.new/liveMedia/Locale.cpp 2011-07-07 01:07:09.881034659 +0200
@@ -22,19 +22,18 @@
#include "Locale.hh"
#include <strDup.hh>
@@ -66,9 +64,10 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
}
#endif
}
---- live.orig/liveMedia/RTSPClient.cpp 2010-03-16 03:09:46.000000000 +0100
-+++ live/liveMedia/RTSPClient.cpp 2010-08-24 15:04:31.000000000 +0200
-@@ -1019,7 +1019,7 @@
+diff -ruN live/liveMedia/RTSPClient.cpp live.new/liveMedia/RTSPClient.cpp
+--- live/liveMedia/RTSPClient.cpp 2011-07-06 21:18:43.000000000 +0200
++++ live.new/liveMedia/RTSPClient.cpp 2011-07-07 01:07:59.993283156 +0200
+@@ -469,7 +469,7 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
@@ -77,7 +76,7 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
sprintf(buf, "Scale: %f\r\n", scale);
}
-@@ -1033,11 +1033,11 @@
+@@ -483,11 +483,11 @@
buf[0] = '\0';
} else if (end < 0) {
// There's no end time:
@@ -91,9 +90,7 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
---- live/liveMedia/RTSPClient.cpp 2010-08-24 17:05:46.000000000 +0200
-+++ live.new/liveMedia/RTSPClient.cpp 2010-08-24 17:04:50.000000000 +0200
-@@ -935,7 +935,7 @@
+@@ -919,7 +919,7 @@
}
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
@@ -102,8 +99,9 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
return sscanf(paramStr, "%f", &scale) == 1;
}
---- live/liveMedia/RTSPCommon.cpp.orig 2011-01-06 01:26:50.000000000 +0100
-+++ live/liveMedia/RTSPCommon.cpp 2011-01-09 16:32:24.142645155 +0100
+diff -ruN live/liveMedia/RTSPCommon.cpp live.new/liveMedia/RTSPCommon.cpp
+--- live/liveMedia/RTSPCommon.cpp 2011-07-06 21:18:44.000000000 +0200
++++ live.new/liveMedia/RTSPCommon.cpp 2011-07-07 01:07:59.997283172 +0200
@@ -137,7 +137,7 @@
Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
double start, end;
+--- live/liveMedia/RTSPServerSupportingHTTPStreaming.cpp 2011-07-21 19:59:32.000000000 +0200
++++ live.new/liveMedia/RTSPServerSupportingHTTPStreaming.cpp 2011-07-31 00:02:23.700137585 +0200
+@@ -66,7 +66,7 @@
+ // Failed to 'stat' the file; return an empty string
+ buf[0] = '\0';
+ } else {
+- strftime(buf, sizeof buf, "Last-Modified: %a, %b %d %Y %H:%M:%S GMT\r\n", gmtime(&sb.st_mtime));
++ strftime(buf, sizeof buf, "Last-Modified: %a, %b %d %Y %H:%M:%S GMT\r\n", gmtime((const time_t*)&sb.st_mtime));
+ }
+
+ return buf;
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index a717c40..99580f0 100644
--- a/extras/contrib/src/contrib-src.mak
......@@ -162,5 +97,5 @@ index a717c40..99580f0 100644
LIVE_TARGET-$(ENABLED) = linux
LIVE_TARGET-$(HAVE_WIN32) = mingw
--
1.7.5.4
1.7.6
From dde8316449516a4abd0849a06b630290f858bb1c Mon Sep 17 00:00:00 2001
From 77901d9bff3a7748a42d48135e572e3d85662271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Thu, 7 Jul 2011 01:23:53 +0200
Subject: [PATCH 8/8] Old contribs: enable mkv for Android
......@@ -83,5 +83,5 @@ index 73a8d39..ce4f4a2 100755
--disable-mod \
--disable-sid \
--
1.7.5.4
1.7.6
From dc5844558300becebfce76fb501b3c0425945df2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 31 Jul 2011 01:12:58 +0200
Subject: [PATCH 9/9] Thread: no nanoclock_sleep on Android
---
src/posix/thread.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/posix/thread.c b/src/posix/thread.c
index d944fff..3e30f8e 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -997,7 +997,7 @@ mtime_t mdate (void)
*/
void mwait (mtime_t deadline)
{
-#if (_POSIX_TIMERS > 0)
+#if (_POSIX_TIMERS > 0) && !defined(__ANDROID__)
vlc_clock_setup ();
/* If the deadline is already elapsed, or within the clock precision,
* do not even bother the system timer. */
@@ -1025,7 +1025,7 @@ void msleep (mtime_t delay)
struct timespec ts = mtime_to_ts (delay);
vlc_clock_setup ();
-#if (_POSIX_TIMERS > 0)
+#if (_POSIX_TIMERS > 0) && !defined(__ANDROID__)
while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR);
#else
--
1.7.6
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment