Only use the MSVC inline assembly if we're:

  a) compiling with MSVC
  b) not on win64, where inline assembly isn't implemented (!?)

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

diff --git a/lib/os.h b/lib/os.h
index e59d8d6c0d4048e9e8708130ae3262d58e697c44..d624c692309a8fff14150f0ae87f4b5806ba15bc 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -116,7 +116,9 @@ static inline int vorbis_ftoi(double f){  /* yes, double!  Otherwise,
 #endif
 
 
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(__BORLANDC__)
+/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the 64 bit
+ * compiler */
+#if defined(_MSC_VER) && !defined(_WIN64)
 #  define VORBIS_FPU_CONTROL
 
 typedef ogg_int16_t vorbis_fpu_control;