From 7da8402f9742580188f62cabee8ba01eacb9151d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Mon, 29 May 2023 02:09:14 -0600 Subject: We don't allow unsetting O_NONBLOCK or O_NDELAY on packaged FS diff --git a/ruby.c b/ruby.c index c27f44e..537454e 100644 --- a/ruby.c +++ b/ruby.c @@ -2416,11 +2416,11 @@ open_load_file(VALUE fname_v, int *xflag) /* open(2) may block if fname is point to FIFO and it's empty. Let's use O_NONBLOCK. */ const int MODE_TO_LOAD = O_RDONLY | ( -#if defined O_NONBLOCK && HAVE_FCNTL +#if defined O_NONBLOCK && HAVE_FCNTL && !defined(__HAIKU__) /* TODO: fix conflicting O_NONBLOCK in ruby/win32.h */ !(O_NONBLOCK & O_ACCMODE) ? O_NONBLOCK : #endif -#if defined O_NDELAY && HAVE_FCNTL +#if defined O_NDELAY && HAVE_FCNTL && !defined(__HAIKU__) !(O_NDELAY & O_ACCMODE) ? O_NDELAY : #endif 0); -- 2.39.2