summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-10-23 12:43:23 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-10-23 12:43:23 +0200
commitaf6b8ff5330851bd12bb1b011fdbd29fead5bf3c (patch)
treee04a2fac10b4c9adcdec507195f134670d698bae /vdr.c
parent5b2784cc4f066edb5a6db3c5d88222f5959bd7ed (diff)
downloadvdr-af6b8ff5330851bd12bb1b011fdbd29fead5bf3c.tar.gz
vdr-af6b8ff5330851bd12bb1b011fdbd29fead5bf3c.tar.bz2
Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL systems; also removed the NPTL check at startup
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/vdr.c b/vdr.c
index 6d76f178..80f80f54 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.187 2004/10/17 11:50:21 kls Exp $
+ * $Id: vdr.c 1.188 2004/10/23 12:40:24 kls Exp $
*/
#include <getopt.h>
@@ -85,17 +85,6 @@ static void Watchdog(int signum)
int main(int argc, char *argv[])
{
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
- // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
- char LibPthreadVersion[128];
- if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
- if (strstr(LibPthreadVersion, "NPTL")) {
- fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
- return 2;
- }
- }
-#endif
-
// Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
char *LangEnv;
if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||