diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-04-08 13:28:13 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-08 13:28:13 +0900 |
commit | 9e6e39c3512f7a962c44dc3729c98a0f8be90341 (patch) | |
tree | 901a22676d54d78240e450b64a8cd06eb1703910 /include/ruby/io.h | |
parent | 5ac4bf2cd87e1eb5779ca5ae7f96a1a22e8436d9 (diff) |
Merge pull request #2991 from shyouhei/ruby.h
Split ruby.h
Notes
Notes:
Merged-By: shyouhei <shyouhei@ruby-lang.org>
Diffstat (limited to 'include/ruby/io.h')
-rw-r--r-- | include/ruby/io.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/include/ruby/io.h b/include/ruby/io.h index 7d7b1a0f01..5a80c76290 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -12,12 +12,7 @@ #ifndef RUBY_IO_H #define RUBY_IO_H 1 -#if defined(__cplusplus) -extern "C" { -#if 0 -} /* satisfy cc-mode */ -#endif -#endif +#include "ruby/3/config.h" #include <stdio.h> #include "ruby/encoding.h" @@ -26,7 +21,6 @@ extern "C" { #include <stdio_ext.h> #endif -#include "ruby/config.h" #include <errno.h> #if defined(HAVE_POLL) # ifdef _AIX @@ -49,7 +43,8 @@ extern "C" { # define RB_WAITFD_OUT 0x004 #endif -RUBY_SYMBOL_EXPORT_BEGIN +#include "ruby/3/dllexport.h" +RUBY3_SYMBOL_EXPORT_BEGIN() PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t { char *ptr; /* off + len <= capa */ @@ -169,13 +164,6 @@ VALUE rb_stat_new(const struct stat *); /* gc.c */ -RUBY_SYMBOL_EXPORT_END - -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif +RUBY3_SYMBOL_EXPORT_END() #endif /* RUBY_IO_H */ |