frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed the NPTL check at startup

This commit is contained in:
Klaus Schmidinger 2005-06-18 11:21:12 +02:00
parent 806aeb3c07
commit 7e81649d68
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -3620,3 +3620,5 @@ Video Disk Recorder Revision History
- Modified page scrolling behaviour (based on a suggestion by Patrick Gleichmann). - 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 - The new setup option "OSD/Scroll wraps" can be used to activate wrapping around
in menu lists (based on a suggestion by Patrick Gleichmann). 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.

9
INSTALL
View File

@ -7,14 +7,7 @@ Version 1.3
IMPORTANT NOTES: IMPORTANT NOTES:
---------------- ----------------
VDR currently doesn't work with NPTL ("Native Posix Thread Library"). Please make sure your environment is NOT set to use UTF-8 or
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
any other multibyte character representation. Check the value of your any other multibyte character representation. Check the value of your
$LANG or $LC_CTYPE environment variable, and if it contains something $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" like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"

13
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.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> #include <getopt.h>
@ -302,17 +302,6 @@ int main(int argc, char *argv[])
return 0; 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 // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
char *LangEnv; char *LangEnv;
if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") || if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||