Merge branch 'master' of https://github.com/r-lyeh/stb into working

Conflicts: stb.h

Merge branch 'master' of https://github.com/r-lyeh/stb into working
Conflicts: stb.h
a96eb047 · Sean Barrett · c6f33a1f · 8702dce4 · a96eb047
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

stb.h stb.h +1 -1

未找到文件。
--- a/stb.h
+++ b/stb.h
@@ -1422,7 +1422,7 @@ int stb_is_pow2(unsigned int n)
 int stb_log2_floor(unsigned int n)
 {
   #if _MSC_VER > 1700
-   DWORD i;
+   unsigned int i;
   _BitScanReverse(&i, n);
   return i != 0 ? i : -1;
   #else