Commit 951b94d3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "Call XInitThreads early enough"

This reverts commit 364868f9.
On deeper look, this deadlocks in all kind of places. I guess we'll
have to live with the racy Xlib behavior instead.

Conflicts:

	configure.ac
parent 9305440a
......@@ -33,9 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
#endif
/* Explicit HACK */
extern void LocaleFree (const char *);
......@@ -84,15 +82,6 @@ int main( int i_argc, const char *ppsz_argv[] )
# endif
#endif
#ifdef HAVE_X11_XLIB_H
/* Initialize Xlib thread support. */
if (!XInitThreads ())
{
fputs ("VLC requires a thread-safe Xlib. Sorry.\n", stderr);
return 1;
}
#endif
/* Synchronously intercepted POSIX signals.
*
* In a threaded program such as VLC, the only sane way to handle signals
......
......@@ -3964,9 +3964,6 @@ AC_ARG_ENABLE(x11,
CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/Xlib.h, [
VLC_ADD_CPPFLAGS([vlc], [${X_CFLAGS}])
VLC_ADD_LIBS([vlc], [${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_PLUGIN([x11_screen])
VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment