libvorbis version of fix for Trac #1578

[platform/upstream/libvorbis.git] / lib / os.h

diff --git a/lib/os.h b/lib/os.h
index 960a382..3a0b268 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -7,7 +7,7 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
  * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
@@ -47,7 +47,7 @@
 
 #if defined(_WIN32) && !defined(__SYMBIAN32__)
 #  include <malloc.h>
-#  define rint(x)   (floor((x)+0.5f)) 
+#  define rint(x)   (floor((x)+0.5f))
 #  define NO_FLOAT_MATH_LIB
 #  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
 #endif
@@ -97,7 +97,7 @@ static inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){
   ogg_int16_t temp;
   __asm__ __volatile__("fnstcw %0\n\t"
           "movw %0,%%dx\n\t"
-          "orw $62463,%%dx\n\t"
+          "andw $62463,%%dx\n\t"
           "movw %%dx,%1\n\t"
           "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx");
   *fpu=ret;