diff options
| author | Sutou Kouhei <[email protected]> | 2021-07-05 10:45:48 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-07-13 19:37:46 +0900 |
| commit | bb868f4814c09c978f20f224c5e99656bc8b9bee (patch) | |
| tree | 0bfeb0e7494510d244c8cf21b830d69059d13f6c /ext/fiddle/memory_view.c | |
| parent | 5c0d8c6369f92915bf99924f58f0763abe4f493e (diff) | |
[ruby/fiddle] Use have_header and have_type to detect memory view availability
Fix https://github.com/ruby/fiddle/pull/84
It may detect ruby/memory_view.h for system Ruby that is installed in
/usr.
We can use RUBY_API_VERSION_MAJOR to detect memory view availability
because memory view is available since Ruby 3.0.
Reported by Jun Aruga. Thanks!!!
https://github.com/ruby/fiddle/commit/3292929830
Diffstat (limited to 'ext/fiddle/memory_view.c')
| -rw-r--r-- | ext/fiddle/memory_view.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c index 3e260f94f9..c9df5fd2bd 100644 --- a/ext/fiddle/memory_view.c +++ b/ext/fiddle/memory_view.c @@ -1,10 +1,11 @@ +#include <fiddle.h> + +#ifdef FIDDLE_MEMORY_VIEW + #include <stdbool.h> #include <ruby/ruby.h> #include <ruby/encoding.h> - -#ifdef HAVE_RUBY_MEMORY_VIEW_H -# include <ruby/memory_view.h> -#endif +#include <ruby/memory_view.h> #if SIZEOF_INTPTR_T == SIZEOF_LONG_LONG # define INTPTR2NUM LL2NUM @@ -17,9 +18,6 @@ # define UINTPTR2NUM UINT2NUM #endif -#include <fiddle.h> - -#ifdef FIDDLE_MEMORY_VIEW VALUE rb_cMemoryView = Qnil; struct memview_data { |