Bug 455372 - WinCE LibVorbis No FPU Support on WinMobile. patch by wo…

…lfe. r=chris.double
leto · Sep 23, 2008 · 0179d35 · 0179d35
1 parent f4b6a80
commit 0179d35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/media/libvorbis/README_MOZILLA b/media/libvorbis/README_MOZILLA
@@ -4,4 +4,8 @@ were those applied by update.sh and the addition/upate of Makefile.in
 files for the Mozilla build system.
 
 Some files are renamed during the copy to prevent clashes with object
-file names with other Mozilla libraries.
+file names with other Mozilla libraries.
+
+BUG 455372 - WinCE LibVorbis No FPU Support on WinMobile, removed FPU
+support for builds with WINCE defined.
+
diff --git a/media/libvorbis/lib/os.h b/media/libvorbis/lib/os.h
@@ -79,7 +79,7 @@ void *_alloca(size_t size);
 #  define max(x,y)  ((x)<(y)?(y):(x))
 #endif
 
-#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__)
+#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) && !defined(WINCE)
 #  define VORBIS_FPU_CONTROL
 /* both GCC and MSVC are kinda stupid about rounding/casting to int.
    Because of encapsulation constraints (GCC can't see inside the asm
@@ -116,7 +116,7 @@ static inline int vorbis_ftoi(double f){  /* yes, double!  Otherwise,
 #endif
 
 
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(__BORLANDC__)
+#if defined(_WIN32) && !defined(__GNUC__) && !defined(__BORLANDC__) && !defined(WINCE)
 #  define VORBIS_FPU_CONTROL
 
 typedef ogg_int16_t vorbis_fpu_control;