Fixed checking for the presence of NPTL

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dfbe07b9..f09cb259 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1044,6 +1044,7 @@ Philip Lawatsch <philip@lawatsch.at>
 
 Jouni Karvo <kex@netlab.hut.fi>
  for suggesting to make the cOsd constructor 'protected'
+ for fixing checking for the presence of NPTL
 
 Olaf Henkel <olafhenkel@t-online.de>
  for reporting a problem with long event texts in the "Classic VDR" skin
diff --git a/HISTORY b/HISTORY
index 232d2499..93ebfb18 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2966,3 +2966,7 @@ Video Disk Recorder Revision History
   of the various parts of the channel name is yet to come.
 - The 'radio' channel icon is now only displayed in the ST:TNG skin if the channel
   actually has an APID.
+
+2004-07-27: Version 1.3.13
+
+- Fixed checking for the presence of NPTL (thanks to Jouni Karvo).
diff --git a/vdr.c b/vdr.c
index fc1f9e09..1215fcbb 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.184 2004/06/13 13:52:09 kls Exp $
+ * $Id: vdr.c 1.185 2004/07/27 07:21:22 kls Exp $
  */
 
 #include <getopt.h>
@@ -87,7 +87,7 @@ 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 (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;