Blob Blame History Raw
diff -up gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian gnuradio-3.6.5/gr-blocks/lib/wavfile.cc
--- gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian	2013-06-12 13:41:54.000000000 +0200
+++ gnuradio-3.6.5/gr-blocks/lib/wavfile.cc	2013-06-12 13:42:22.000000000 +0200
@@ -38,14 +38,14 @@ namespace gr {
     // Define host to/from worknet (little endian) short and long
 #ifdef BOOST_BIG_ENDIAN
 
-    static inline uint16_t __wav_bs16(uint16_t x)
+    static inline uint16_t __gri_wav_bs16(uint16_t x)
     {
       return (x>>8) | (x<<8);
     }
 
-    static inline uint32_t __wav_bs32(uint32_t x)
+    static inline uint32_t __gri_wav_bs32(uint32_t x)
     {
-      return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16)));
+      return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16)));
     }
 
     #define htowl(x) __gri_wav_bs32(x)