Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Call XInitThreads early enough"

This reverts commit 826fdf5.
  • Loading branch information...
commit a32ad11892a8ade265c59c4529b92c4880ce28a2 1 parent 826fdf5
Rémi Denis-Courmont authored
Showing with 1 addition and 14 deletions.
  1. +1 −12 bin/vlc.c
  2. +0 −2  configure.ac
View
13 bin/vlc.c
@@ -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 *);
@@ -88,15 +86,6 @@ int main( int i_argc, const char *ppsz_argv[] )
/* FIXME: rootwrap (); */
#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
View
2  configure.ac
@@ -3947,8 +3947,6 @@ if test "${enable_x11}" != "no" &&
test "${enable_x11}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}"
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([panoramix])
VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
Please sign in to comment.
Something went wrong with that request. Please try again.