rutine -> routine
Also MSVC complains that FLAC__uint32* (unsigned int*) is not of the same type
as unsigned long*
--- a\src\libFLAC\include\private\bitmath.h 2013-08-13 13:30:24.000000000
+0400
+++ b\src\libFLAC\include\private\bitmath.h 2013-08-14 10:20:51.484053700
+0400
@@ -78,12 +78,12 @@
return _bit_scan_reverse(v) ^ 31U;
#elif defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__
>= 4))
/* This will translate either to (bsr ^ 31U), clz , ctlz, cntlz, lzcnt
depending on
- * -march= setting or to a software rutine in exotic machines. */
+ * -march= setting or to a software routine in exotic machines. */
return __builtin_clz(v);
#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
- FLAC__uint32 idx;
+ unsigned long idx;
_BitScanReverse(&idx, v);
- return idx ^ 31U;
+ return (unsigned)idx ^ 31U;
#else
return FLAC__clz_soft_uint32(v);
#endif
_______________________________________________
flac-dev mailing list
flac-dev@xiph.org
http://lists.xiph.org/mailman/listinfo/flac-dev
