From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 28F0B3048D2; Tue, 28 Feb 2023 22:04:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 28F0B3048D2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1677611052; bh=aT8GQwW12J/V0XZsmT+wiPD9c7ViEbtXlR0wKcW3RxM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=rZNtYiIUXjr66ZJMGgxi0Zu0E0SiX1090UlKR0jSSASyyq11K+spOI9I9aYVia5Zc 89Kmi+TJQDwA+UZ6+5EEf+QJW1rYj13ZTnLBEcmoIFNuVtaoUaA4mXeM0+b/VCH43o yyfZQVR8UPLxuDfSokmf3mL/U69ZocmI5U3gb9ek= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id E15FB3048D2 for ; Tue, 28 Feb 2023 22:03:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E15FB3048D2 Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1pX5GG-000qWR-4Y; Tue, 28 Feb 2023 22:03:40 +0300 To: Sergey Kaplun , Maxim Kokryashkin Date: Tue, 28 Feb 2023 19:00:44 +0000 Message-Id: <7eda9ee6eccfab1aa9c47123c8cbaf3de7b62121.1677607479.git.imun@tarantool.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD94A31EA4B0797EF2EE50B5111BED4E5A0F9C3BE6961C3C823182A05F5380850404C228DA9ACA6FE2798DCB17F0933372A8FFA6CA2C5A5032E1AB27081DB10C085937104F6DBFA3B8A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E30B1A6D2A18B481EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377028CFB5BD7FD30C8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8423F65E1DB9D071595E15019D3BC9EDE117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2076EC165927BBF1389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC85E59ED9F89912417117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF1AC2B076AE1D81A9BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B62A5A2CA50ABE476A76E601842F6C81A1F004C906525384303E02D724532EE2C3F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CAA44A86D94E7BBB043847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A51DC391A4A5A8BEE47E9A1CA50CC155C8F3EE92C30FAB093F4EAF44D9B582CE87C8A4C02DF684249C2E763F503762DF505830FD47C92F6C63 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343D1F112031EF3D62828C406D9C43A40FC32C8AFAEB80ADF3C3B37AAD37406D956C34C3E0D9CAC5C21D7E09C32AA3244C7C801BD44B4041F7C6C4CF615CC6A13F9CA7333006C390A0927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMN6DA1mNzI85Ohe+Sq98tQ== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D531D395CDE6305F6E735511EC3E07B9E50C15B41CDBF38D8D0B2326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit v2 1/5] Minor fixes. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall (cherry picked from commit 54484e257f24c47d71b8233844e2ec8664db8071) This is a tiny patch fixing header dependencies for the build with -DLUAJIT_DISABLE_JIT=ON and whitespace inconsistency. Igor Munkin: * added the description Part of tarantool/tarantool#8069 Signed-off-by: Igor Munkin --- src/lib_base.c | 2 +- src/lj_gc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_base.c b/src/lib_base.c index 398c4f65..eb6da054 100644 --- a/src/lib_base.c +++ b/src/lib_base.c @@ -505,7 +505,7 @@ LJLIB_CF(print) tv = L->top-1; } shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) - && !gcrefu(basemt_it(G(L), LJ_TNUMX)); + && !gcrefu(basemt_it(G(L), LJ_TNUMX)); for (i = 0; i < nargs; i++) { cTValue *o = &L->base[i]; const char *str; diff --git a/src/lj_gc.c b/src/lj_gc.c index 29387a48..c306047a 100644 --- a/src/lj_gc.c +++ b/src/lj_gc.c @@ -25,6 +25,7 @@ #include "lj_cdata.h" #endif #include "lj_trace.h" +#include "lj_dispatch.h" #include "lj_vm.h" #define GCSTEPSIZE 1024u -- 2.30.2