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

Replace PACKED_STRUCT in include

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-02-06 21:56:04 +09:00
parent 899ea35035
commit fefe37f98d
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2023-02-08 06:21:28 +00:00 
Merged: https://github.com/ruby/ruby/pull/7268
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ruby/io.h
View File

@ -49,11 +49,11 @@
/** @endcond */ /** @endcond */
#include "ruby/internal/attr/const.h" #include "ruby/internal/attr/const.h"
#include "ruby/internal/attr/packed_struct.h"
#include "ruby/internal/attr/pure.h" #include "ruby/internal/attr/pure.h"
#include "ruby/internal/attr/noreturn.h" #include "ruby/internal/attr/noreturn.h"
#include "ruby/internal/dllexport.h" #include "ruby/internal/dllexport.h"
#include "ruby/internal/value.h" #include "ruby/internal/value.h"
#include "ruby/backward/2/attributes.h" /* PACKED_STRUCT_UNALIGNED */
// IO#wait, IO#wait_readable, IO#wait_writable, IO#wait_priority are defined by this implementation. // IO#wait, IO#wait_readable, IO#wait_writable, IO#wait_priority are defined by this implementation.
#define RUBY_IO_WAIT_METHODS #define RUBY_IO_WAIT_METHODS
@ -88,7 +88,8 @@ typedef enum {
* IO buffers. This is an implementation detail of ::rb_io_t::wbuf and * IO buffers. This is an implementation detail of ::rb_io_t::wbuf and
* ::rb_io_t::rbuf. People don't manipulate it directly. * ::rb_io_t::rbuf. People don't manipulate it directly.
*/ */
PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t { RBIMPL_ATTR_PACKED_STRUCT_UNALIGNED_BEGIN()
struct rb_io_buffer_t {
/** Pointer to the underlying memory region, of at least `capa` bytes. */ /** Pointer to the underlying memory region, of at least `capa` bytes. */
char *ptr; /* off + len <= capa */ char *ptr; /* off + len <= capa */
@ -101,7 +102,7 @@ PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t {
/** Designed capacity of the buffer. */ /** Designed capacity of the buffer. */
int capa; int capa;
}); } RBIMPL_ATTR_PACKED_STRUCT_UNALIGNED_END();
/** @alias{rb_io_buffer_t} */ /** @alias{rb_io_buffer_t} */
typedef struct rb_io_buffer_t rb_io_buffer_t; typedef struct rb_io_buffer_t rb_io_buffer_t;