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 E7A0A257FFB; Mon, 13 Feb 2023 20:03:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E7A0A257FFB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1676307839; 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=HZFi81dNqvpMJ1AUz/DZMSP/cJjSMfyxmBzGBNB1w/u5rF451QFPqvNiWYZVHZjwm +aMhC+cdMGWZY0MlcJ5AVGmMuCFQQrYchVTuTNHpI44P934etSWEunMGDtpew/FBG4 U7yo4SVMrtXCzXNkPMWAW2G+C0b8FFxfCFsWbOII= Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [95.163.41.84]) (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 0AC62209901 for ; Mon, 13 Feb 2023 20:03:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0AC62209901 Received: by smtp46.i.mail.ru with esmtpa (envelope-from ) id 1pRcEi-00Ft6R-9R; Mon, 13 Feb 2023 20:03:28 +0300 To: Sergey Kaplun , Maxim Kokryashkin Date: Mon, 13 Feb 2023 17:02:43 +0000 Message-Id: <1e6b855feff94f39699b44b231be5850c958475d.1676304797.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: 4F1203BC0FB41BD94A31EA4B0797EF2EBEF8AA50000CB2E0FF25F7F485B287F1182A05F5380850404C228DA9ACA6FE277E44C8C83A4CD91A19303AB149D289B5FC1A756107E1C4ADBC87646F6F246008 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A1E06C56A402FD6FEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637954B64E58FDAD6938638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B29A367544E02A8CE72A222F200BBC91117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCE287FC2BA681BAD5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735200AC5B80A05675ACDF04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEFAD5A440E159F97DE0F2381F647739FAD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3DA532D2019E286A76E0066C2D8992A16C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637FB177F6A8366F17BEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5F12EA8E93A131311A59A189A3A238BDCD75156990E3ED06C4EAF44D9B582CE87C8A4C02DF684249C2E763F503762DF505830FD47C92F6C63 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D345C110A855FC09999025A9087231ABB23D0DA8CBB376B0057C37208612A8077C00D685D2C4E3F2C071D7E09C32AA3244CC983EFDC9022809A0CD504E05044C524A95CA90A1D8AC565927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojgB/I+mAIlFFfLiwoMZQ/5w== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D531626392C2CE6982C6E3392DCB9CABCA94630B727F4F9CAE742326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 1/7] 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