frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed checking for the presence of NPTL

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-07-27 07:22:34 +02:00
parent bee9f13024
commit d99901c2ad
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1044,6 +1044,7 @@ Philip Lawatsch <philip@lawatsch.at>
Jouni Karvo <kex@netlab.hut.fi> Jouni Karvo <kex@netlab.hut.fi>
for suggesting to make the cOsd constructor 'protected' for suggesting to make the cOsd constructor 'protected'
for fixing checking for the presence of NPTL
Olaf Henkel <olafhenkel@t-online.de> Olaf Henkel <olafhenkel@t-online.de>
for reporting a problem with long event texts in the "Classic VDR" skin for reporting a problem with long event texts in the "Classic VDR" skin

4
HISTORY
View File

@ -2966,3 +2966,7 @@ Video Disk Recorder Revision History
of the various parts of the channel name is yet to come. 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 - The 'radio' channel icon is now only displayed in the ST:TNG skin if the channel
actually has an APID. actually has an APID.
2004-07-27: Version 1.3.13
- Fixed checking for the presence of NPTL (thanks to Jouni Karvo).

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #include <getopt.h>
@ -87,7 +87,7 @@ int main(int argc, char *argv[])
#ifdef _CS_GNU_LIBPTHREAD_VERSION #ifdef _CS_GNU_LIBPTHREAD_VERSION
// Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL: // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
char LibPthreadVersion[128]; 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")) { if (strstr(LibPthreadVersion, "NPTL")) {
fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n"); fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
return 2; return 2;