sean-m
/
stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Releases Activity

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

Conflicts:
	stb.h
pull/228/head
Sean Barrett 2016-01-22 05:05:30 -08:00
parent 7d4f7c566e 412e1ecc16
commit a33e40b1d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stb.h
View File

@ -206,7 +206,7 @@ CREDITS
#endif #endif
#endif #endif
#ifdef _WIN32 #if defined(_WIN32) && !defined(__MINGW32__)
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
@ -735,7 +735,7 @@ int stb_vsnprintf(char *s, size_t n, const char *fmt, va_list v)
#endif #endif
if (n) s[n-1] = 0; if (n) s[n-1] = 0;
// Unix returns length output would require, Windows returns negative when truncated. // 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, ...) int stb_snprintf(char *s, size_t n, const char *fmt, ...)