Fix building with MSVC for ARM

cmnintrin.h only existed for Windows CE, and doesn't seem to actually be necessary for building this.
mstorsjo · Oct 28, 2016 · 8724dc8 · 8724dc8
1 parent 3f138a3
commit 8724dc8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h
@@ -154,7 +154,6 @@ [email protected]
 #endif
 
 #ifdef _M_ARM
-#include "cmnintrin.h"
 #include "armintr.h"
 #endif
 

diff --git a/libSBRdec/src/arm/lpp_tran_arm.cpp b/libSBRdec/src/arm/lpp_tran_arm.cpp
@@ -97,7 +97,10 @@ [email protected]
 #ifdef FUNCTION_LPPTRANSPOSER_func1
 
 /* Note: This code requires only 43 cycles per iteration instead of 61 on ARM926EJ-S */
-__attribute__ ((noinline)) static void lppTransposer_func1(
+#ifdef __GNUC__
+__attribute__ ((noinline))
+#endif
+static void lppTransposer_func1(
   FIXP_DBL *lowBandReal,
   FIXP_DBL *lowBandImag,
   FIXP_DBL **qmfBufferReal,
-Original file line number
+Diff line change
@@ Expand Up / @@ -154,7 +154,6 @@ [email protected] @@
     #endif
     #ifdef _M_ARM
-    #include "cmnintrin.h"
     #include "armintr.h"
     #endif
@@ Expand Down @@