Tarantool development patches archive
 help / color / mirror / Atom feed
From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>,
	Maxim Kokryashkin <m.kokryashkin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit v2 1/5] Minor fixes.
Date: Tue, 28 Feb 2023 19:00:44 +0000	[thread overview]
Message-ID: <7eda9ee6eccfab1aa9c47123c8cbaf3de7b62121.1677607479.git.imun@tarantool.org> (raw)
In-Reply-To: <cover.1677607479.git.imun@tarantool.org>

From: Mike Pall <mike>

(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 <imun@tarantool.org>
---
 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


  reply	other threads:[~2023-02-28 19:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-28 19:00 [Tarantool-patches] [PATCH luajit v2 0/5] Adjust tests to be run when JIT is disabled Igor Munkin via Tarantool-patches
2023-02-28 19:00 ` Igor Munkin via Tarantool-patches [this message]
2023-03-01 19:25   ` [Tarantool-patches] [PATCH luajit v2 1/5] Minor fixes Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 2/5] build: fix build with JIT disabled Igor Munkin via Tarantool-patches
2023-03-01 19:27   ` Maxim Kokryashkin via Tarantool-patches
2023-03-02 15:52     ` Igor Munkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests Igor Munkin via Tarantool-patches
2023-03-01 10:04   ` Sergey Kaplun via Tarantool-patches
2023-03-02 16:42     ` Igor Munkin via Tarantool-patches
2023-03-01 19:28   ` Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 4/5] test: fix lua-Harness " Igor Munkin via Tarantool-patches
2023-03-01 10:08   ` Sergey Kaplun via Tarantool-patches
2023-03-01 19:30   ` Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 5/5] ci: add nojit flavor for exotic builds Igor Munkin via Tarantool-patches
2023-03-01 19:30   ` Maxim Kokryashkin via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7eda9ee6eccfab1aa9c47123c8cbaf3de7b62121.1677607479.git.imun@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=imun@tarantool.org \
    --cc=m.kokryashkin@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH luajit v2 1/5] Minor fixes.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox