Skip to content

Commit 93f9564

Browse files
committed
Check HAVE_RUBY_MEMORY_VIEW_H rather than API version
1 parent 90634e7 commit 93f9564

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

ext/-test-/memory_view/extconf.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# frozen_string_literal: false
22
require "mkmf"
33

4-
if have_header("ruby/memory_view.h")
5-
have_type("rb_memory_view_t", ["ruby/memory_view.h"])
6-
end
7-
84
require_relative "../auto_ext.rb"
95
auto_ext(inc: true)

ext/-test-/memory_view/memory_view.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifdef HAVE_TYPE_RB_MEMORY_VIEW_T
1+
#ifdef HAVE_RUBY_MEMORY_VIEW_H
22

33
#include "ruby.h"
44
#include "ruby/memory_view.h"
@@ -378,12 +378,12 @@ mdview_aref(VALUE obj, VALUE indices_v)
378378
return result;
379379
}
380380

381-
#endif /* HAVE_TYPE_RB_MEMORY_VIEW_T */
381+
#endif /* HAVE_RUBY_MEMORY_VIEW_H */
382382

383383
void
384384
Init_memory_view(void)
385385
{
386-
#ifdef HAVE_TYPE_RB_MEMORY_VIEW_T
386+
#ifdef HAVE_RUBY_MEMORY_VIEW_H
387387
VALUE mMemoryViewTestUtils = rb_define_module("MemoryViewTestUtils");
388388

389389
rb_define_module_function(mMemoryViewTestUtils, "available?", memory_view_available_p, 1);
@@ -448,5 +448,5 @@ Init_memory_view(void)
448448

449449
#undef DEF_ALIGNMENT_CONST
450450

451-
#endif /* HAVE_TYPE_RB_MEMORY_VIEW_T */
451+
#endif /* HAVE_RUBY_MEMORY_VIEW_H */
452452
}

ext/fiddle/fiddle.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define FIDDLE_H
33

44
#include <ruby.h>
5-
#include <ruby/version.h>
65
#include <errno.h>
76

87
#if defined(_WIN32)
@@ -190,7 +189,7 @@
190189
#define ALIGN_INT32_T ALIGN_OF(int32_t)
191190
#define ALIGN_INT64_T ALIGN_OF(int64_t)
192191

193-
#if RUBY_API_VERSION_MAJOR >= 3
192+
#ifdef HAVE_RUBY_MEMORY_VIEW_H
194193
# define FIDDLE_MEMORY_VIEW
195194
#endif
196195

0 commit comments

Comments
 (0)