From 7e81649d683cd203b6dbb64a28b7a68489a9c0d2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 18 Jun 2005 11:21:12 +0200
Subject: Removed the NPTL check at startup

---
 HISTORY |  2 ++
 INSTALL |  9 +--------
 vdr.c   | 13 +------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/HISTORY b/HISTORY
index f76eff9f..8af90d8f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3620,3 +3620,5 @@ Video Disk Recorder Revision History
 - Modified page scrolling behaviour (based on a suggestion by Patrick Gleichmann).
 - The new setup option "OSD/Scroll wraps" can be used to activate wrapping around
   in menu lists (based on a suggestion by Patrick Gleichmann).
+- Removed the NPTL check at startup, since several users have reported that VDR
+  now runs fine with NPTL.
diff --git a/INSTALL b/INSTALL
index e894e8db..581a5d91 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,14 +7,7 @@ Version 1.3
 IMPORTANT NOTES:
 ----------------
 
-VDR currently doesn't work with NPTL ("Native Posix Thread Library").
-Either don't use NPTL, or set the environment variable
-
-  LD_ASSUME_KERNEL=2.4.1
-  
-before running VDR.
-
-Also, please make sure your environment is NOT set to use UTF-8 or
+Please make sure your environment is NOT set to use UTF-8 or
 any other multibyte character representation. Check the value of your
 $LANG or $LC_CTYPE environment variable, and if it contains something
 like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
diff --git a/vdr.c b/vdr.c
index 10a5888f..bd9de2fd 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.207 2005/05/26 10:45:29 kls Exp $
+ * $Id: vdr.c 1.208 2005/06/18 11:19:07 kls Exp $
  */
 
 #include <getopt.h>
@@ -302,17 +302,6 @@ int main(int argc, char *argv[])
      return 0;
      }
 
-#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