From ee8669c0e07521d9abbca233996a8b2164b0185e Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Fri, 27 Feb 2015 19:07:00 +0000 Subject: [PATCH] Don't use MSVC inline assembly on arm targets. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch from Hugo Beauzée-Luyssen. Fixes the build in WindowsRT/ARM. svn path=/trunk/vorbis/; revision=19449 --- lib/os.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/os.h b/lib/os.h index eae9b8b..fb79cbb 100644 --- a/lib/os.h +++ b/lib/os.h @@ -119,8 +119,9 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the - * 64 bit compiler */ -#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) + * 64 bit compiler and doesn't work on arm. */ +#if defined(_MSC_VER) && !defined(_WIN64) && \ + !defined(_WIN32_WCE) && !defined(_M_ARM) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; -- 2.7.4