[vlc-commits] Undefine bswap16, bswap32, and bswap64 to avoid name clash on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Mon Oct 10 20:44:15 2011 +0900| [47be7a662751937ea67b50ac347206ede3cbe7fd] | committer: Rémi Denis-Courmont

Undefine bswap16, bswap32, and bswap64 to avoid name clash on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47be7a662751937ea67b50ac347206ede3cbe7fd
---

 include/vlc_common.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 8e03ed3..320d445 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -630,6 +630,12 @@ static inline unsigned popcount (unsigned x)
 #endif
 }
 
+#ifdef __OS2__
+#   undef bswap16
+#   undef bswap32
+#   undef bswap64
+#endif
+
 /** Byte swap (16 bits) */
 VLC_USED
 static inline uint16_t bswap16 (uint16_t x)