diff options
| author | nagachika <nagachika@ruby-lang.org> | 2024-07-15 12:00:14 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2024-07-15 12:00:14 +0900 |
| commit | db45554fef4c8e1b0ba494965449db13068e6051 (patch) | |
| tree | 0625b827ea1be07dded27dc8c9050876c2f35542 /include/ruby | |
| parent | 0cb1e753cadb4cd1706ecf334e007bb246438577 (diff) | |
merge revision(s) 1faeb44dfcf777ace28321e80d0ebf942161a0a7, 7f87ad9fc4bc45faf8cd33602a025f27c094b2fd: [Backport #20431]
Check if macros are defined before using
Assume macros with the same prefix would be defined together.
Refer autoconfigured endian macro (#10572)
Remove the case `RB_IO_BUFFER_HOST_ENDIAN` is not defined.
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/io/buffer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/ruby/io/buffer.h b/include/ruby/io/buffer.h index 88e5598066..e4b855d8e7 100644 --- a/include/ruby/io/buffer.h +++ b/include/ruby/io/buffer.h @@ -56,14 +56,10 @@ enum rb_io_buffer_endian { RB_IO_BUFFER_LITTLE_ENDIAN = 4, RB_IO_BUFFER_BIG_ENDIAN = 8, -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN, -#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if defined(WORDS_BIGENDIAN) RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN, -#elif REG_DWORD == REG_DWORD_LITTLE_ENDIAN +#else RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN, -#elif REG_DWORD == REG_DWORD_BIG_ENDIAN - RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN, #endif RB_IO_BUFFER_NETWORK_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN |