[vlc-devel] commit: Remove the glibc libintl kludge. ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed May 7 19:57:22 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Wed May  7 20:18:31 2008 +0300| [7db96bf8cb3e9a57917f3297e68b6f33f573b944]

Remove the glibc libintl kludge.

Afterall it's not our bug. More importantly, the vlc_cond_wait "possible
deadlock" debug message has been removed, which makes the problem a lot
less likely to happen.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7db96bf8cb3e9a57917f3297e68b6f33f573b944
---

 src/vlc.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/vlc.c b/src/vlc.c
index 7f7f224..208fd86 100644
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -35,9 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
-#ifdef __GLIBC__
-#include <dlfcn.h>
-#endif
 
 
 /* Explicit HACK */
@@ -68,20 +65,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 {
     int i_ret, id;
 
-#   ifdef __GLIBC__
-    if (dlsym (RTLD_NEXT, "inet6_rth_add") && !dlsym (RTLD_NEXT, "qsort_r"))
-    {
-        /* Way too many Linux users have glibc 2.5-2.7 that keeps crashing
-         * inside its non-thread-safe dcgettext(). */
-        /* Hopefully glibc 2.8 will eventually work, not sure though */
-        fprintf (stderr,
-"***************************************************\n"
-"*** glibc version with broken libintl detected. ***\n"
-"*** Messages localization will be disabled.     ***\n"
-"***************************************************\n");
-        setenv ("LC_MESSAGES", "C", 1);
-    }
-#   endif
     setlocale (LC_ALL, "");
 
 #ifndef __APPLE__




More information about the vlc-devel mailing list