diff options
| author | scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-10-11 21:23:16 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-10-11 21:23:16 +0000 |
| commit | 9203acd86b237b7dfbbd08bd6d5a7f3208e0c2bb (patch) | |
| tree | 327f879562bfe505bad3d1089a5cbe7140a042ee /source | |
| parent | e258ca6f209b26bbd5bd83069de6e2840177158f (diff) | |
| download | libvpx-9203acd86b237b7dfbbd08bd6d5a7f3208e0c2bb.tar.gz | |
Get libvpx to compile on VS2013.
`round` is defined in the runtime library now.
R=johannkoenig@google.com
Review URL: https://codereview.chromium.org/23922008
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@228256 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'source')
| -rw-r--r-- | source/libvpx/vp9/common/vp9_systemdependent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/libvpx/vp9/common/vp9_systemdependent.h b/source/libvpx/vp9/common/vp9_systemdependent.h index cc909e2..f8e1934 100644 --- a/source/libvpx/vp9/common/vp9_systemdependent.h +++ b/source/libvpx/vp9/common/vp9_systemdependent.h @@ -23,8 +23,8 @@ void vpx_reset_mmx_state(void); #define vp9_clear_system_state() #endif -#ifdef _MSC_VER -// round is not defined in MSVC +#if defined(_MSC_VER) && _MSC_VER < 1800 +// round is not defined in MSVC before VS2013. static int round(double x) { if (x < 0) return (int)ceil(x - 0.5); |