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

Conflicts: stb.h
2015-09-13 05:58:57 -07:00
parent c6f33a1ff0 8702dce4d6
commit a96eb04795
1 changed files with 1 additions and 1 deletions
--- 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