From 6d98c5460f7f0ee5045d665443b2397ed8a124ba Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 28 Nov 2014 10:52:06 +0000 Subject: [PATCH] Added getlocaledecpoint() workaround for Android build of lua plugin git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14555 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPlugins/lua/lua-5.2.3/src/llex.c | 5 ----- src/osgPlugins/lua/lua-5.2.3/src/luaconf.h | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/osgPlugins/lua/lua-5.2.3/src/llex.c b/src/osgPlugins/lua/lua-5.2.3/src/llex.c index c4b820e83..5a12fca91 100644 --- a/src/osgPlugins/lua/lua-5.2.3/src/llex.c +++ b/src/osgPlugins/lua/lua-5.2.3/src/llex.c @@ -201,11 +201,6 @@ static void buffreplace (LexState *ls, char from, char to) { } -#if !defined(getlocaledecpoint) -#define getlocaledecpoint() (localeconv()->decimal_point[0]) -#endif - - #define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e) /* diff --git a/src/osgPlugins/lua/lua-5.2.3/src/luaconf.h b/src/osgPlugins/lua/lua-5.2.3/src/luaconf.h index 18be9a9e4..0af71efca 100644 --- a/src/osgPlugins/lua/lua-5.2.3/src/luaconf.h +++ b/src/osgPlugins/lua/lua-5.2.3/src/luaconf.h @@ -533,6 +533,15 @@ #endif /* } */ + + +#if defined(__ANDROID__) +#define getlocaledecpoint() '.' +#elif !defined(getlocaledecpoint) +#define getlocaledecpoint() (localeconv()->decimal_point[0]) +#endif + + /* }================================================================== */