summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Giles <giles@xiph.org>2015-02-27 19:07:00 +0000
committerRalph Giles <giles@xiph.org>2015-02-27 19:07:00 +0000
commitee8669c0e07521d9abbca233996a8b2164b0185e (patch)
tree9917942f8d4ffe7003dad47d3433e615c0d4778e
parentd2e910158f79160cd396fc3cf1ea4b6ec7e83498 (diff)
downloadlibvorbis-git-ee8669c0e07521d9abbca233996a8b2164b0185e.tar.gz
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
-rw-r--r--lib/os.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/os.h b/lib/os.h
index eae9b8b9..fb79cbbc 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;