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

Conflicts:
	stb.h
This commit is contained in:
Sean Barrett 2015-09-13 05:58:57 -07:00
commit a96eb04795

2
stb.h
View File

@ -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