1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builtin.h must be included *AFTER* vm_core.h

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-11-08 14:26:21 +09:00
parent 20971799f2
commit 99b1c19be4
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
io.c
View File

@ -22,6 +22,25 @@
#include <errno.h> #include <errno.h>
#include "ruby_atomic.h" #include "ruby_atomic.h"
#include "ccan/list/list.h" #include "ccan/list/list.h"
/* non-Linux poll may not work on all FDs */
#if defined(HAVE_POLL)
# if defined(__linux__)
# define USE_POLL 1
# endif
# if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
# define USE_POLL 1
# endif
#endif
#ifndef USE_POLL
# define USE_POLL 0
#endif
#if !USE_POLL
# include "vm_core.h"
#endif
#include "builtin.h" #include "builtin.h"
#undef free #undef free
@ -10802,20 +10821,6 @@ maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
return FALSE; return FALSE;
} }
/* non-Linux poll may not work on all FDs */
#if defined(HAVE_POLL)
# if defined(__linux__)
# define USE_POLL 1
# endif
# if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
# define USE_POLL 1
# endif
#endif
#ifndef USE_POLL
# define USE_POLL 0
#endif
#if USE_POLL #if USE_POLL
# define IOWAIT_SYSCALL "poll" # define IOWAIT_SYSCALL "poll"
STATIC_ASSERT(pollin_expected, POLLIN == RB_WAITFD_IN); STATIC_ASSERT(pollin_expected, POLLIN == RB_WAITFD_IN);
@ -10831,7 +10836,6 @@ nogvl_wait_for_single_fd(int fd, short events)
return poll(&fds, 1, -1); return poll(&fds, 1, -1);
} }
#else /* !USE_POLL */ #else /* !USE_POLL */
# include "vm_core.h"
# define IOWAIT_SYSCALL "select" # define IOWAIT_SYSCALL "select"
static int static int
nogvl_wait_for_single_fd(int fd, short events) nogvl_wait_for_single_fd(int fd, short events)