mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
![Warner Losh](/assets/img/avatar_default.png)
Merge commit '755d9301ca89f02956fd17858b9d4d821ab5c972' from the vendor branch. This updates us from lua 5.4.2 to 5.4.4. In addition, it switches around how we flavor liblua for the boot loader and flua. This is done to reduce diffs with upstream and make it easier to import new versions (the current method has too many conflicts to resolve by hand): we include luaconf.local.h from luaconf.h (the only change to this file is now that #include at the end). We then define what we need to: for flua (which does very little) and one for stand (which creates the new FLOAT type out of int64). Sponsored by: Netflix
26 lines
505 B
C
26 lines
505 B
C
/*
|
|
* Copyright (c) 2023, Netflix, Inc
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
/*
|
|
* We need to always define this. For the boot loader, we use it. For flua
|
|
* we don't, but it needs to be defined to keep some ifdefs happy.
|
|
*/
|
|
#define LUA_FLOAT_INT64 4
|
|
|
|
#define LUA_USE_POSIX
|
|
#ifndef BOOTSTRAPPING
|
|
#define LUA_USE_DLOPEN
|
|
#endif
|
|
|
|
#undef LUA_ROOT
|
|
#undef LUA_LDIR
|
|
#undef LUA_CDIR
|
|
#define LUA_ROOT "/usr/"
|
|
#define LUA_LDIR LUA_ROOT "share/flua/"
|
|
#define LUA_CDIR LUA_ROOT "lib/flua/"
|