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

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Jul 11 12:11:47 2016 +0200| [b6a556923ccb44c833406685118c6d94428ec896] | committer: Rafaël Carré

Revert "Contribs: lua, simpler way to disable localeconv"

This reverts commit a009c26a4a341d2786e0f399cd9c4b6c058ff59d.

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

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

diff --git a/contrib/src/lua/no-localeconv.patch b/contrib/src/lua/no-localeconv.patch
index ea6e06f..240398d 100644
--- a/contrib/src/lua/no-localeconv.patch
+++ b/contrib/src/lua/no-localeconv.patch
@@ -1,12 +1,11 @@
---- lua/src/luaconf.h.orig	2016-03-16 15:53:05.433295367 +0100
-+++ lua/src/luaconf.h	2016-03-16 15:53:21.497295811 +0100
-@@ -654,7 +654,8 @@
- ** macro must include header 'locale.h'.)
+--- 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 @@
  */
- #if !defined(lua_getlocaledecpoint)
--#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
-+//#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
-+#define lua_getlocaledecpoint()		'.'
- #endif
- 
- /* }================================================================== */
+ 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 */