]> git.sesse.net Git - vlc/commitdiff
Undefine bswap16, bswap32, and bswap64 to avoid name clash on OS/2
authorKO Myung-Hun <komh@chollian.net>
Mon, 10 Oct 2011 11:44:15 +0000 (20:44 +0900)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 10 Oct 2011 16:16:45 +0000 (19:16 +0300)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
include/vlc_common.h

index 8e03ed36e31a366d2b924b7e29e94f7f1453fab1..320d44565db30cb9c7ac8c94dfd2c186ce205636 100644 (file)
@@ -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)