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

* pack.c (swap32): Don't redefine it if it is already defined.

Browse Source 
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:
akr 2013-05-07 03:09:15 +00:00
parent 9e08404b8a
commit 570015a18b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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
View File

@ -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