Don't use MSVC inline assembly on arm targets.
authorRalph Giles <giles@xiph.org>
Fri, 27 Feb 2015 19:07:00 +0000 (19:07 +0000)
committerRalph Giles <giles@xiph.org>
Fri, 27 Feb 2015 19:07:00 +0000 (19:07 +0000)
Patch from Hugo BeauzĂ©e-Luyssen. Fixes the build in WindowsRT/ARM.

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

lib/os.h

index eae9b8b..fb79cbb 100644 (file)
--- 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;