ruby-changes:66743
From: Nobuyoshi <ko1@a...>
Date: Sat, 10 Jul 2021 17:41:38 +0900 (JST)
Subject: [ruby-changes:66743] cb3eb3d7d5 (master): Get rid of conflict in ccan/list
https://git.ruby-lang.org/ruby.git/commit/?id=cb3eb3d7d5 From cb3eb3d7d516a12957939491f3c3cc663c1a9240 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 10 Jul 2021 17:39:25 +0900 Subject: Get rid of conflict in ccan/list Undefine LIST_HEAD from BSD-origin sys/queue.h. --- gc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gc.c b/gc.c index b71a209..ff2f308 100644 --- a/gc.c +++ b/gc.c @@ -82,6 +82,8 @@ https://github.com/ruby/ruby/blob/trunk/gc.c#L82 #include <emscripten.h> #endif +#undef LIST_HEAD /* ccan/list conflicts with BSD-origin sys/queue.h. */ + #include "constant.h" #include "debug_counter.h" #include "eval_intern.h" -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/