diff options
| author | Nicholas Corgan | 2012-06-22 11:19:58 -0700 |
|---|---|---|
| committer | Nicholas Corgan | 2012-06-22 11:19:58 -0700 |
| commit | 056d3006d07c11c4bfba9ac5c2f82111be55dd35 (patch) | |
| tree | 02ae9725f56f45d7fee75746d8d08e71941bcfc6 /gnuradio-core/src/lib | |
| parent | 85fc01d1715e40da147e4c5dbff0c7edd2f315d4 (diff) | |
| download | gnuradio-056d3006d07c11c4bfba9ac5c2f82111be55dd35.tar.gz gnuradio-056d3006d07c11c4bfba9ac5c2f82111be55dd35.tar.bz2 gnuradio-056d3006d07c11c4bfba9ac5c2f82111be55dd35.zip | |
gruel: got rid of inet.h and adjusted only file that depended on it
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/io/gri_wavfile.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc index 3bc9d8fad..780bd1b98 100644 --- a/gnuradio-core/src/lib/io/gri_wavfile.cc +++ b/gnuradio-core/src/lib/io/gri_wavfile.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,7 +27,7 @@ #include <gri_wavfile.h> #include <cstring> #include <stdint.h> -#include <gruel/inet.h> +#include <boost/asio.hpp> # define VALID_COMPRESSION_TYPE 0x0001 @@ -36,12 +36,12 @@ // Basically, this is the opposite of htonx() and ntohx() #ifdef WORDS_BIGENDIAN -static inline uint32_t host_to_wav(uint32_t x) { return bswap_32(x); } -static inline uint16_t host_to_wav(uint16_t x) { return bswap_16(x); } -static inline int16_t host_to_wav(int16_t x) { return bswap_16(x); } -static inline uint32_t wav_to_host(uint32_t x) { return bswap_32(x); } -static inline uint16_t wav_to_host(uint16_t x) { return bswap_16(x); } -static inline int16_t wav_to_host(int16_t x) { return bswap_16(x); } +static inline uint32_t host_to_wav(uint32_t x) { return htonl(x); } +static inline uint16_t host_to_wav(uint16_t x) { return htons(x); } +static inline int16_t host_to_wav(int16_t x) { return htons(x); } +static inline uint32_t wav_to_host(uint32_t x) { return ntohl(x); } +static inline uint16_t wav_to_host(uint16_t x) { return ntohs(x); } +static inline int16_t wav_to_host(int16_t x) { return ntohs(x); } #else |