From 60fb6d485944ea9dc07900a566cd5bd6ba5e083f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 23 May 2024 12:49:30 +0900 Subject: merge revision(s) 7f87ad9fc4bc45faf8cd33602a025f27c094b2fd: Refer autoconfigured endian macro (#10572) Remove the case `RB_IO_BUFFER_HOST_ENDIAN` is not defined. --- include/ruby/io/buffer.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- include/ruby/io/buffer.h | 8 ++------ version.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/ruby/io/buffer.h b/include/ruby/io/buffer.h index 726c26d157..4763b88cce 100644 --- a/include/ruby/io/buffer.h +++ b/include/ruby/io/buffer.h @@ -51,14 +51,10 @@ enum rb_io_buffer_endian { RB_IO_BUFFER_LITTLE_ENDIAN = 4, RB_IO_BUFFER_BIG_ENDIAN = 8, -#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN, -#elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if defined(WORDS_BIGENDIAN) RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN, -#elif defined(REG_DWORD) && REG_DWORD == REG_DWORD_LITTLE_ENDIAN +#else RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN, -#elif defined(REG_DWORD) && 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 diff --git a/version.h b/version.h index 8915a06a9e..a0460419fd 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 257 +#define RUBY_PATCHLEVEL 258 #define RUBY_RELEASE_YEAR 2024 #define RUBY_RELEASE_MONTH 5 -- cgit v1.2.3