v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict.

pull/749/head
Kim Kulling 2016-01-06 22:19:07 +01:00
parent 56a77b2429
commit 54ac680400
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/zlib/gzwrite.c
View File

@ -351,10 +351,10 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
# endif # endif
#else #else
# ifdef HAS_vsnprintf_void # ifdef HAS_vsnprintf_void
(void)vai_snprintf((char *)(state->in), size, format, va); (void)vsnprintf((char *)(state->in), size, format, va);
len = strlen((char *)(state->in)); len = strlen((char *)(state->in));
# else # else
len = vai_snprintf((char *)(state->in), size, format, va); len = vsnprintf((char *)(state->in), size, format, va);
# endif # endif
#endif #endif
@ -438,11 +438,11 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
# endif # endif
#else #else
# ifdef HAS_snprintf_void # ifdef HAS_snprintf_void
ai_snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
len = strlen((char *)(state->in)); len = strlen((char *)(state->in));
# else # else
len = ai_snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
a19, a20); a19, a20);
# endif # endif