2 files changed, 2 insertions, 2 deletions
diff --git a/io.c b/io.c
index 6a0d7114d2..56332fe929 100644
--- a/io.c
+++ b/io.c
@@ -4671,8 +4671,8 @@ io_close_fptr(VALUE io)
     VALUE write_io;
     rb_io_t *write_fptr;
     struct list_head busy;
-    busy.n.next = busy.n.prev = &busy.n;
 
+    list_head_init(&busy);
     write_io = GetWriteIO(io);
     if (io != write_io) {
         write_fptr = RFILE(write_io)->fptr;
diff --git a/thread.c b/thread.c
index 7ca6625d7c..70338bff38 100644
--- a/thread.c
+++ b/thread.c
@@ -2289,8 +2289,8 @@ void
 rb_thread_fd_close(int fd)
 {
     struct list_head busy;
-    busy.n.next = busy.n.prev = &busy.n;
 
+    list_head_init(&busy);
     if (rb_notify_fd_close(fd, &busy)) {
 	do rb_thread_schedule(); while (!list_empty(&busy));
     }