Merge branches 'bugfixes' and 'fixes' into feature
This commit is contained in:
commit
82b7e96cea
3 changed files with 10 additions and 3 deletions
|
@ -23,10 +23,10 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
]]
|
||||
|
||||
cleantags_version = "1.301"
|
||||
cleantags_modified = "13 November 2009"
|
||||
cleantags_version = "1.302"
|
||||
cleantags_modified = "12 October 2023"
|
||||
|
||||
ktag = "\\[kK][fo]?%d+"
|
||||
ktag = "\\[kK][fo]?[%d.]+"
|
||||
|
||||
--[[ The main function that performs the cleaning up
|
||||
Takes: text
|
||||
|
|
|
@ -326,6 +326,12 @@ namespace Automation4 {
|
|||
{
|
||||
lua_getfield(L, -1, "items");
|
||||
read_string_array(L, items);
|
||||
|
||||
#ifdef __WXMAC__
|
||||
if (std::find(items.begin(), items.end(), value) == items.end()) {
|
||||
items.insert(items.begin(), value);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
bool CanSerialiseValue() const override { return true; }
|
||||
|
|
|
@ -21,6 +21,7 @@ else
|
|||
hpre = '#include "@0@/../lj_arch.h"'.format(meson.current_source_dir())
|
||||
|
||||
checkdefs = [
|
||||
['LJ_LE', '1', ['-D', 'ENDIAN_LE']],
|
||||
['LJ_ARCH_BITS', '64', ['-D', 'P64']],
|
||||
['LJ_HASJIT', '1', ['-D', 'JIT']],
|
||||
['LJ_HASFFI', '1', ['-D', 'FFI']],
|
||||
|
|
Loading…
Reference in a new issue