diff options
author | Sebastian Koslowski <koslowski@kit.edu> | 2016-06-10 15:15:16 +0200 |
---|---|---|
committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-07-13 16:30:36 +0200 |
commit | 893b74c770b81f2c09094577e2de720155f84b61 (patch) | |
tree | ce430f554cf032c70eab8a95228731afbffc6efd /gr-vocoder/lib/codec2/fdmdv.c | |
parent | 7ac7cf6246e4d984d36c64df10ba4d2b2f6b2204 (diff) | |
parent | 6fb0ff274a05daf2f2677af14337704fb88081f7 (diff) |
Merge remote-tracking branch 'grcwg/next_grcwg' into gtk3
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 |