Date: Sun, 24 Jan 2021 03:43:53 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 12139a196aca - stable/12 - Fix -Wundef warnings when building liblua Message-ID: <202101240343.10O3hr64067673@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=12139a196aca6701dd096f373742e0f97735597c commit 12139a196aca6701dd096f373742e0f97735597c Author: Alex Richardson <arichardson@FreeBSD.org> AuthorDate: 2020-08-25 13:30:34 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2021-01-24 03:43:26 +0000 Fix -Wundef warnings when building liblua We need to define the LUA_FLOAT_INT64 macro even if we don't use it (copied from stand/luaconf.h). While touching luaconf.h.dist also sync it with the the 5.3.5 release version (matches the one in lib/liblua). (cherry picked from commit 0c54932d50a0cbffdd083bf6b2e8d587902f90c9) --- contrib/lua/src/luaconf.h.dist | 10 +++++++++- lib/liblua/luaconf.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/contrib/lua/src/luaconf.h.dist b/contrib/lua/src/luaconf.h.dist index f37bea0964bd..1b96c5443ebf 100644 --- a/contrib/lua/src/luaconf.h.dist +++ b/contrib/lua/src/luaconf.h.dist @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $ +** $Id: luaconf.h,v 1.259.1.1 2017/04/19 17:29:57 roberto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -114,6 +114,7 @@ #define LUA_FLOAT_FLOAT 1 #define LUA_FLOAT_DOUBLE 2 #define LUA_FLOAT_LONGDOUBLE 3 +#define LUA_FLOAT_INT64 4 #if defined(LUA_32BITS) /* { */ /* @@ -620,6 +621,13 @@ #endif +/* +@@ lua_pointer2str converts a pointer to a readable string in a +** non-specified way. +*/ +#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p) + + /* @@ lua_number2strx converts a float to an hexadecimal numeric string. ** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that. diff --git a/lib/liblua/luaconf.h b/lib/liblua/luaconf.h index bc7f5bb6e141..d13fde35fb5a 100644 --- a/lib/liblua/luaconf.h +++ b/lib/liblua/luaconf.h @@ -122,6 +122,7 @@ #define LUA_FLOAT_FLOAT 1 #define LUA_FLOAT_DOUBLE 2 #define LUA_FLOAT_LONGDOUBLE 3 +#define LUA_FLOAT_INT64 4 #if defined(LUA_32BITS) /* { */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101240343.10O3hr64067673>