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

reroute macro conflicts on OpenBSD

Browse Source 
OpenBSD's <sys/endian.h> has its own swap32() etc.  We have to avoid
name conflicts.

See also https://rubyci.org/logs/rubyci.s3.amazonaws.com/openbsd-current/ruby-master/log/20191226T210011Z.log.html.gz#miniruby
This commit is contained in:
卜部昌平 2019-12-27 10:17:06 +09:00
parent 018769e291
commit 8c5430e274
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/bits.h
View File

@ -117,9 +117,21 @@
64 - nlz_int64((uint64_t)(x))) 64 - nlz_int64((uint64_t)(x)))
#endif #endif
static inline uint16_t swap16(uint16_t); #ifndef swap16
static inline uint32_t swap32(uint32_t); # define swap16 ruby_swap16
static inline uint64_t swap64(uint64_t); #endif
#ifndef swap32
# define swap32 ruby_swap32
#endif
#ifndef swap64
# define swap64 ruby_swap64
#endif
static inline uint16_t ruby_swap16(uint16_t);
static inline uint32_t ruby_swap32(uint32_t);
static inline uint64_t ruby_swap64(uint64_t);
static inline unsigned nlz_int(unsigned x); static inline unsigned nlz_int(unsigned x);
static inline unsigned nlz_long(unsigned long x); static inline unsigned nlz_long(unsigned long x);
static inline unsigned nlz_long_long(unsigned long long x); static inline unsigned nlz_long_long(unsigned long long x);
@ -139,7 +151,7 @@ static inline VALUE RUBY_BIT_ROTL(VALUE, int);
static inline VALUE RUBY_BIT_ROTR(VALUE, int); static inline VALUE RUBY_BIT_ROTR(VALUE, int);
static inline uint16_t static inline uint16_t
swap16(uint16_t x) ruby_swap16(uint16_t x)
{ {
#if __has_builtin(__builtin_bswap16) #if __has_builtin(__builtin_bswap16)
return __builtin_bswap16(x); return __builtin_bswap16(x);
@ -154,7 +166,7 @@ swap16(uint16_t x)
} }
static inline uint32_t static inline uint32_t
swap32(uint32_t x) ruby_swap32(uint32_t x)
{ {
#if __has_builtin(__builtin_bswap32) #if __has_builtin(__builtin_bswap32)
return __builtin_bswap32(x); return __builtin_bswap32(x);
@ -171,7 +183,7 @@ swap32(uint32_t x)
} }
static inline uint64_t static inline uint64_t
swap64(uint64_t x) ruby_swap64(uint64_t x)
{ {
#if __has_builtin(__builtin_bswap64) #if __has_builtin(__builtin_bswap64)
return __builtin_bswap64(x); return __builtin_bswap64(x);