diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
commit | c034036fbb0a097b2ccbbacdfdb113f8355cdbcc (patch) | |
tree | 12366caf390de89db7e7e32646b08854c8f01bc5 /gr-vocoder/lib/codec2/fdmdv.c | |
parent | 11ce2621937e6fa1d5440c8f485c7a27b9d34d27 (diff) | |
parent | c5f7b07aff9320e3d13bb8d26aa4dc43093e569a (diff) |
Merge branch 'next' into 'next-qt5'
Diffstat (limited to 'gr-vocoder/lib/codec2/fdmdv.c')
-rw-r--r-- | gr-vocoder/lib/codec2/fdmdv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-vocoder/lib/codec2/fdmdv.c b/gr-vocoder/lib/codec2/fdmdv.c index 8855f76ae5..51d6bef544 100644 --- a/gr-vocoder/lib/codec2/fdmdv.c +++ b/gr-vocoder/lib/codec2/fdmdv.c @@ -25,7 +25,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER < 1800) // round() not available before VS 2013 #define round(number) number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5) #endif |