@@ -9,7 +9,7 @@

  LIBVLC_ABI_MINOR=0

  LIBVLC_ABI_MICRO=0

-@@ -2054,7 +2054,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 

+@@ -2053,7 +2053,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 

  dnl

  dnl dvdread module: check for libdvdread

  dnl

@@ -18,7 +18,7 @@

  dnl

  dnl libdvdnav plugin

-@@ -2369,7 +2369,7 @@ AC_ARG_ENABLE(mod,

+@@ -2368,7 +2368,7 @@ AC_ARG_ENABLE(mod,

    AS_HELP_STRING(--disable-mod,

      do not use libmodplug (default auto)))

  if test "${enable_mod}" != "no" ; then

@@ -27,7 +27,7 @@

            VLC_ADD_PLUGIN(mod)

            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)

            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

-@@ -4658,7 +4658,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",

+@@ -4657,7 +4657,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",

     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`

  )

  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)

@@ -60,7 +60,7 @@

          msg_Err( p_this, "unable to initialize liba52" );

 --- a/modules/control/cli/cli.c

 +++ b/modules/control/cli/cli.c

-@@ -537,9 +537,8 @@ static void cli_client_delete(struct cli_client *cl)

+@@ -540,9 +540,8 @@ static void cli_client_delete(struct cli_client *cl)

      free(cl);

  }

@@ -71,23 +71,9 @@

      intf_sys_t *sys = intf->p_sys;

      vlc_thread_set_name("vlc-cli-server");

-@@ -576,6 +575,13 @@ static void *Run(void *data)

-     }

- }

- 

-+static void *Run(void *data)

-+{

-+    intf_thread_t *intf = data;

-+    _Run(intf);

-+    return NULL;

-+}

-+

- #else

- static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)

- {

 --- a/src/Makefile.am

 +++ b/src/Makefile.am

-@@ -559,7 +559,7 @@ libvlccore_la_LDFLAGS = \

+@@ -560,7 +560,7 @@ libvlccore_la_LDFLAGS = \

    $(LDFLAGS_libvlccore) \

    -no-undefined \

    -export-symbols $(srcdir)/libvlccore.sym \

​