svn commit: r364767 - in head: contrib/lua/src lib/liblua

[Alex Richardson]

Author: arichardson
Date: Tue Aug 25 13:30:34 2020
New Revision: 364767
URL: https://svnweb.freebsd.org/changeset/base/364767

Log:
  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).
  
  Reviewed By:	kevans
  Differential Revision: https://reviews.freebsd.org/D25977

Modified:
  head/contrib/lua/src/luaconf.h.dist
  head/lib/liblua/luaconf.h

Modified: head/contrib/lua/src/luaconf.h.dist
==============================================================================
--- head/contrib/lua/src/luaconf.h.dist	Tue Aug 25 13:30:29 2020	(r364766)
+++ head/contrib/lua/src/luaconf.h.dist	Tue Aug 25 13:30:34 2020	(r364767)
@@ -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)		/* { */
 /*
@@ -618,6 +619,13 @@
 #if !defined(LUA_USE_C89)
 #define lua_strx2number(s,p)		lua_str2number(s,p)
 #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)
 
 
 /*

Modified: head/lib/liblua/luaconf.h
==============================================================================
--- head/lib/liblua/luaconf.h	Tue Aug 25 13:30:29 2020	(r364766)
+++ head/lib/liblua/luaconf.h	Tue Aug 25 13:30:34 2020	(r364767)
@@ -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)		/* { */
 /*