d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua: reduce diffs between luaconf.h copies

Browse Source 
Upstream luaconf.h is contrib/lua/src/luaconf.h.dist, while userland lua
and loader lua have copies in lib/liblua/luaconf.h and
stand/liblua/luaconf.h.

Adjust whitespace, VCS tags, etc. to match upstream's version, for ease
of comparison.

Reviewed By:	imp
Sponsored By:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D38206
This commit is contained in:
Ed Maste 2023-01-25 17:01:00 -05:00
parent 18b83b626a
commit ec96506307
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/liblua/luaconf.h
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
/*
** $Id: luaconf.h $
** Configuration file for Lua
@ -83,7 +82,7 @@
*/
#define LUAI_IS32INT ((UINT_MAX >> 30) >= 3)
/* }================================================================== */
/* }================================================================== */
@ -203,6 +202,7 @@
#define LUA_LDIR "!\\lua\\"
#define LUA_CDIR "!\\"
#define LUA_SHRDIR "!\\..\\share\\lua\\" LUA_VDIR "\\"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
@ -211,7 +211,7 @@
".\\?.lua;" ".\\?\\init.lua"
#endif
#if !define(LUA_CPATH_DEFAULT)
#if !defined(LUA_CPATH_DEFAULT)
#define LUA_CPATH_DEFAULT \
LUA_CDIR"?.dll;" \
LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \

7
stand/liblua/luaconf.h
View File

@ -1,6 +1,5 @@
/* $FreeBSD$ */
/*
** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $
** $Id: luaconf.h $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
@ -218,7 +217,7 @@
#define LUA_LDIR LUA_ROOT "share/"
#define LUA_CDIR LUA_ROOT "lib/"
#ifndef LUA_PATH_DEFAULT
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
@ -433,6 +432,7 @@
#define lua_str2number(s,p) strtof((s), (p))
#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */
#define LUA_NUMBER long double
@ -783,3 +783,4 @@
#endif