From: Ralph Giles <giles@xiph.org>
Date: Fri, 27 Feb 2015 19:07:00 +0000 (+0000)
Subject: Don't use MSVC inline assembly on arm targets.
X-Git-Tag: v1.3.5~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee8669c0e07521d9abbca233996a8b2164b0185e;p=platform%2Fupstream%2Flibvorbis.git

Don't use MSVC inline assembly on arm targets.

Patch from Hugo Beauzée-Luyssen. Fixes the build in WindowsRT/ARM.

svn path=/trunk/vorbis/; revision=19449
---

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;