Index: trunk/include/mpcdec/huffman.h
===================================================================
--- trunk/include/mpcdec/huffman.h	(revision 6)
+++ trunk/include/mpcdec/huffman.h	(revision 7)
Index: trunk/include/mpcdec/internal.h
===================================================================
--- trunk/include/mpcdec/internal.h	(revision 6)
+++ trunk/include/mpcdec/internal.h	(revision 7)
@@ -46,5 +46,5 @@
 /// Big/little endian 32 bit byte swapping routine.
 static __inline
-mpc_uint32_t swap32(mpc_uint32_t val) {
+mpc_uint32_t mpc_swap32(mpc_uint32_t val) {
     return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) |
             ((val & 0x0000ff00) <<  8) | ((val & 0x000000ff) << 24));
Index: trunk/include/mpcdec/reader.h
===================================================================
--- trunk/include/mpcdec/reader.h	(revision 6)
+++ trunk/include/mpcdec/reader.h	(revision 7)