Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>,
	Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0
Date: Tue, 29 Oct 2024 11:42:58 +0300	[thread overview]
Message-ID: <20241029084258.6881-1-skaplun@tarantool.org> (raw)

When building <tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c> on
macOS Sequoia 15.0, I've got the following error from including
<sys/ptrace.h>:

| error: unknown type name 'caddr_t'
| int     ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);

It can be fixed by including <sys/types.h>, but since this test is
skipped for macOS anyway, I prefer just to move all necessary includes
under the corresponding define.
---

Branch: https://github.com/tarantool/luajit/tree/skaplun/gh-noticket-fix-macos-c-tests

 .../gh-8594-sysprof-ffunc-crash.test.c               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
index cf1d815a..4067ba1d 100644
--- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
+++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
@@ -5,12 +5,6 @@
 #include "test.h"
 #include "utils.h"
 
-#include <signal.h>
-#include <sys/ptrace.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
 /* XXX: Still need normal assert inside <tracee> and helpers. */
 #undef NDEBUG
 #include <assert.h>
@@ -24,6 +18,12 @@
 
 #if LUAJIT_OS == LUAJIT_OS_LINUX && LUAJIT_TARGET == LUAJIT_ARCH_X64
 
+#include <signal.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
 /*
  * XXX: The test makes sysprof collect the particular event
  * (FFUNC) at the particular instruction (<lj_fff_res1>) to
-- 
2.47.0


                 reply	other threads:[~2024-10-29  8:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20241029084258.6881-1-skaplun@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=m.kokryashkin@tarantool.org \
    --cc=sergeyb@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0' \
    /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