提交 a33e40b1 编写于 作者: S Sean Barrett

Merge branch 'master' of https://github.com/timsjostrand/stb into stb_h_fix

Conflicts:
	stb.h
......@@ -206,7 +206,7 @@ CREDITS
#endif
#endif
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
......@@ -735,7 +735,7 @@ int stb_vsnprintf(char *s, size_t n, const char *fmt, va_list v)
#endif
if (n) s[n-1] = 0;
// Unix returns length output would require, Windows returns negative when truncated.
return (res >= n || res < 0) ? -1 : res;
return (res >= (int) n || res < 0) ? -1 : res;
}
int stb_snprintf(char *s, size_t n, const char *fmt, ...)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册