From 263c3c01a277b7a9519b621dfde23fbc5a8bfc56 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 6 Nov 2004 10:32:00 +0100 Subject: Reactivated the NPTL check at startup --- vdr.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'vdr.c') diff --git a/vdr.c b/vdr.c index d91308f5..c82f2b44 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.192 2004/10/31 10:17:23 kls Exp $ + * $Id: vdr.c 1.193 2004/11/06 10:30:30 kls Exp $ */ #include @@ -87,6 +87,17 @@ 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") || -- cgit v1.2.3