A set of windows utf8 patches fromJanne Hyvärinen <cse@sci.fi>.

[platform/upstream/flac.git] / src / libFLAC / cpu.c

diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index 2b34721..47f5d58 100644 (file)
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -1,5 +1,5 @@
 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -136,7 +136,7 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX = 0x00400000;
 #  endif
 # elif defined(_MSC_VER)
 #  include <windows.h>
-#  undef USE_TRY_CATCH_FLAVOR /* #define this to use the try/catch method for catching illegal opcode exception */
+#  define USE_TRY_CATCH_FLAVOR /* sigill_handler flavor resulted in several crash reports on win32 */
 #  ifdef USE_TRY_CATCH_FLAVOR
 #  else
        LONG CALLBACK sigill_handler_sse_os(EXCEPTION_POINTERS *ep)
@@ -302,9 +302,9 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
                        int sse = 0;
                        LPTOP_LEVEL_EXCEPTION_FILTER save = SetUnhandledExceptionFilter(sigill_handler_sse_os);
                        /* see GCC version above for explanation */
-                       //@@@@@@ http://msdn2.microsoft.com/en-us/library/4ks26t93.aspx
-                       //@@@@@@ http://www.codeproject.com/cpp/gccasm.asp
-                       //@@@@@@ http://www.hick.org/~mmiller/msvc_inline_asm.html
+                       /*  http://msdn2.microsoft.com/en-us/library/4ks26t93.aspx */
+                       /*  http://www.codeproject.com/cpp/gccasm.asp */
+                       /*  http://www.hick.org/~mmiller/msvc_inline_asm.html */
                        __asm {
 #  if _MSC_VER <= 1200
                                /* VC6 assembler doesn't know SSE, have to emit bytecode instead */