[vlc-commits] Contribs: lua, simpler way to disable localeconv

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 16 15:54:34 2016 +0100| [51b895bd7a38337019ff25198ae7ef16d1a98a25] | committer: Jean-Baptiste Kempf

Contribs: lua, simpler way to disable localeconv

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

 contrib/src/lua/no-localeconv.patch |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/contrib/src/lua/no-localeconv.patch b/contrib/src/lua/no-localeconv.patch
index 240398d..e159d33 100644
--- a/contrib/src/lua/no-localeconv.patch
+++ b/contrib/src/lua/no-localeconv.patch
@@ -1,11 +1,12 @@
---- lua/src/llex.c.orig	2016-03-16 12:21:12.567664718 +0100
-+++ lua/src/llex.c	2016-03-16 12:21:39.361675706 +0100
-@@ -226,7 +226,7 @@
+--- contrib-android-arm-linux-androideabi/lua/src/luaconf.h.orig	2016-03-16 15:53:05.433295367 +0100
++++ contrib-android-arm-linux-androideabi/lua/src/luaconf.h	2016-03-16 15:53:21.497295811 +0100
+@@ -654,7 +654,8 @@
+ ** macro must include header 'locale.h'.)
  */
- static void trydecpoint (LexState *ls, TValue *o) {
-   char old = ls->decpoint;
--  ls->decpoint = lua_getlocaledecpoint();
-+  //ls->decpoint = lua_getlocaledecpoint();
-   buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
-   if (luaO_str2num(luaZ_buffer(ls->buff), o) == 0) {
-     /* format error with correct decimal point: no more options */
+ #if !defined(lua_getlocaledecpoint)
+-#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
++//#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
++#define lua_getlocaledecpoint()		'.'
+ #endif
+ 
+ /* }================================================================== */