diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
| commit | a00231d5fc7411c8bb3f0ffdf72f2ccabd2477b6 (patch) | |
| tree | de07a61632c7e9f1f6df9da0df89623f810ae9b4 /gr-blocks/lib/wavfile.cc | |
| parent | 11fd3f467ab8a8c7e548dfed092d102945770f99 (diff) | |
| parent | 48e5bff6fe99b5d4654fcb03a6f8da8a206eb7d7 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc
Diffstat (limited to 'gr-blocks/lib/wavfile.cc')
| -rw-r--r-- | gr-blocks/lib/wavfile.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc index e741cbab4e..1a5b3ff35f 100644 --- a/gr-blocks/lib/wavfile.cc +++ b/gr-blocks/lib/wavfile.cc @@ -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) |