diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 03:47:04 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 03:47:04 +0000 |
commit | 64b15d98228481da0b2c124dcc46f25a242b3676 (patch) | |
tree | 8c9b878eaaaa68810ffe16465dfaa1fecb527845 | |
parent | 4baa7a3f0f605a4bfd908856b8df6e6e02df0615 (diff) | |
download | ruby-64b15d98228481da0b2c124dcc46f25a242b3676.tar.gz |
* pack.c: define swap16 and swap32 only if they are not
defined. OpenBSD defines these macros. [ruby-dev:22181]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | pack.c | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Dec 8 12:44:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * pack.c: define swap16 and swap32 only if they are not + defined. OpenBSD defines these macros. [ruby-dev:22181] + Sun Dec 7 20:54:17 2003 Tanaka Akira <akr@m17n.org> * ext/iconv/iconv.c (map_charset): make case sensitive. @@ -78,7 +78,9 @@ TOKEN_PASTE(swap,x)(z) \ return r; \ } +#ifndef swap16 #define swap16(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF)) +#endif #if SIZEOF_SHORT == 2 #define swaps(x) swap16(x) #else @@ -92,10 +94,12 @@ define_swapx(s,short); #endif #endif +#ifndef swap32 #define swap32(x) ((((x)&0xFF)<<24) \ |(((x)>>24)&0xFF) \ |(((x)&0x0000FF00)<<8) \ |(((x)&0x00FF0000)>>8) ) +#endif #if SIZEOF_LONG == 4 #define swapl(x) swap32(x) #else |