* pack.c (swap32): Don't redefine it if it is already defined.
Bionic defines it. (swap64): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9e08404b8a
commit
570015a18b
@ -1,3 +1,9 @@
|
|||||||
|
Tue May 7 12:07:35 2013 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* pack.c (swap32): Don't redefine it if it is already defined.
|
||||||
|
Bionic defines it.
|
||||||
|
(swap64): Ditto.
|
||||||
|
|
||||||
Mon May 6 20:50:37 2013 Tanaka Akira <akr@fsij.org>
|
Mon May 6 20:50:37 2013 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id
|
* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id
|
||||||
|
13
pack.c
13
pack.c
@ -100,9 +100,16 @@ TOKEN_PASTE(swap,x)(xtype z) \
|
|||||||
return r; \
|
return r; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GCC_VERSION_SINCE(4,3,0)
|
#ifndef swap32
|
||||||
# define swap32(x) __builtin_bswap32(x)
|
# if GCC_VERSION_SINCE(4,3,0)
|
||||||
# define swap64(x) __builtin_bswap64(x)
|
# define swap32(x) __builtin_bswap32(x)
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef swap64
|
||||||
|
# if GCC_VERSION_SINCE(4,3,0)
|
||||||
|
# define swap64(x) __builtin_bswap64(x)
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef swap16
|
#ifndef swap16
|
||||||
|
Loading…
x
Reference in New Issue
Block a user