[vlc-devel] [PATCH 4/4] lua: add libdir to lua dir list on OS/2

[Jean-Baptiste Kempf]

Done for 2.2.

On 30 Sep, KO Myung-Hun wrote :
> Backport to 2.1 and 2.2 respectively, please...
> 
> KO Myung-Hun wrote:
> > Installed version cannot find lua scripts.
> > ---
> >  modules/lua/vlc.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
> > index eac7724..df235d0 100644
> > --- a/modules/lua/vlc.c
> > +++ b/modules/lua/vlc.c
> > @@ -213,7 +213,7 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
> >          i++;
> >      free( datadir );
> >  
> > -#if !(defined(__APPLE__) || defined(_WIN32) || defined(__OS2__))
> > +#if !(defined(__APPLE__) || defined(_WIN32))
> >      char *psz_libpath = config_GetLibDir();
> >      if( likely(psz_libpath != NULL) )
> >      {
> 
> -- 
> KO Myung-Hun
> 
> Using Mozilla SeaMonkey 2.7.2
> Under OS/2 Warp 4 for Korean with FixPak #15
> In VirtualBox v4.1.32 on Intel Core i7-3615QM 2.30GHz with 8GB RAM
> 
> Korean OS/2 User Community : http://www.ecomstation.co.kr
> 

> >From ba2a1b407691cdb661115ab67153022b29ba9413 Mon Sep 17 00:00:00 2001
> From: KO Myung-Hun <komh78 at gmail.com>
> Date: Sat, 27 Sep 2014 09:04:57 +0000
> Subject: [PATCH] lua: add libdir to lua dir list on OS/2
> 
> Installed version cannot find lua scripts.
> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> (cherry picked from commit ff7f5020e7fad15ee8a277aab5f02bef515f3812)
> 
> Signed-off-by: KO Myung-Hun <komh at chollian.net>
> ---
>  modules/lua/vlc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
> index 6f9b505..ad1084a 100644
> --- a/modules/lua/vlc.c
> +++ b/modules/lua/vlc.c
> @@ -215,7 +215,7 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
>          i++;
>      free( datadir );
>  
> -#if !(defined(__APPLE__) || defined(_WIN32) || defined(__OS2__))
> +#if !(defined(__APPLE__) || defined(_WIN32))
>      char *psz_libpath = config_GetLibDir();
>      if( likely(psz_libpath != NULL) )
>      {
> -- 
> 1.7.3.2
> 

> >From 0241bcf3a602718f7faf177911746248ce03f638 Mon Sep 17 00:00:00 2001
> From: KO Myung-Hun <komh78 at gmail.com>
> Date: Sat, 27 Sep 2014 09:04:57 +0000
> Subject: [PATCH] lua: add libdir to lua dir list on OS/2
> 
> Installed version cannot find lua scripts.
> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> (cherry picked from commit ff7f5020e7fad15ee8a277aab5f02bef515f3812)
> 
> Signed-off-by: KO Myung-Hun <komh at chollian.net>
> ---
>  modules/lua/vlc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
> index eac7724..df235d0 100644
> --- a/modules/lua/vlc.c
> +++ b/modules/lua/vlc.c
> @@ -213,7 +213,7 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list )
>          i++;
>      free( datadir );
>  
> -#if !(defined(__APPLE__) || defined(_WIN32) || defined(__OS2__))
> +#if !(defined(__APPLE__) || defined(_WIN32))
>      char *psz_libpath = config_GetLibDir();
>      if( likely(psz_libpath != NULL) )
>      {
> -- 
> 1.7.3.2
> 

> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device