[前][次][番号順一覧][スレッド一覧]

ruby-changes:59934

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Thu, 6 Feb 2020 11:47:20 +0900 (JST)
Subject: [ruby-changes:59934] ce4ea956d2 (master): function pointers are not void*

https://git.ruby-lang.org/ruby.git/commit/?id=ce4ea956d2

From ce4ea956d24eab5089a143bba38126f2b11b55b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Fri, 31 Jan 2020 15:53:03 +0900
Subject: function pointers are not void*

The same as 8427fca49bd85205f5a8766292dd893f003c0e48.

diff --git a/coroutine/ucontext/Context.c b/coroutine/ucontext/Context.c
index 2dc3f47..9ba76ee 100644
--- a/coroutine/ucontext/Context.c
+++ b/coroutine/ucontext/Context.c
@@ -15,7 +15,7 @@ https://github.com/ruby/ruby/blob/trunk/coroutine/ucontext/Context.c#L15
 
 void coroutine_trampoline(void * _start, void * _context)
 {
-    coroutine_start start = _start;
+    coroutine_start start = (coroutine_start)_start;
     struct coroutine_context * context = _context;
 
     start(context->from, context);
diff --git a/mjit.c b/mjit.c
index 5d1a182..697dd23 100644
--- a/mjit.c
+++ b/mjit.c
@@ -464,7 +464,7 @@ rb_mjit_recompile_iseq(const rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/mjit.c#L464
 
     CRITICAL_SECTION_START(3, "in rb_mjit_recompile_iseq");
     remove_from_list(iseq->body->jit_unit, &active_units);
-    iseq->body->jit_func = (void *)NOT_ADDED_JIT_ISEQ_FUNC;
+    iseq->body->jit_func = (mjit_func_t)NOT_ADDED_JIT_ISEQ_FUNC;
     add_to_list(iseq->body->jit_unit, &stale_units);
     CRITICAL_SECTION_FINISH(3, "in rb_mjit_recompile_iseq");
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]