etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2024-11-10 23:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

VS:added the snprintf fix for jansson

Browse source
This commit is contained in:
Jacker 2016-01-17 14:53:38 +02:00
parent badf3ece3c
commit d6ef7ac437
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
jansson/cmake/jansson_private_config.h.cmake
View file

@ -49,6 +49,20 @@
#cmakedefine HAVE_SNPRINTF 1 #cmakedefine HAVE_SNPRINTF 1
/* snprintf should not be defined as macro with MSC_VER >= 1900 */
#if defined(_WIN32) || defined(WIN32)
# if defined(_MSC_VER) /* MS compiller */
# if (_MSC_VER < 1900) /* snprintf not introduced */
# if !defined(snprintf)
# define snprintf _snprintf
# define HAVE_SNPRINTF 1 /* snprintf defined manually */
# endif
# else
# define HAVE_SNPRINTF 1 /* snprintf available via sdk */
# endif
# endif
#endif
#ifndef HAVE_SNPRINTF #ifndef HAVE_SNPRINTF
# define snprintf @JSON_SNPRINTF@ # define snprintf @JSON_SNPRINTF@
#endif #endif

15
jansson/src/jansson_private.h
View file

@ -91,9 +91,18 @@ char *jsonp_strdup(const char *str);
char *jsonp_strndup(const char *str, size_t len); char *jsonp_strndup(const char *str, size_t len);
/* Windows compatibility */ /* Windows compatibility */
#ifdef _WIN32 #if defined(_WIN32) || defined(WIN32)
#define snprintf _snprintf # if defined(_MSC_VER) /* MS compiller */
#define vsnprintf _vsnprintf # if (_MSC_VER < 1900) && !defined(snprintf) /* snprintf not defined yet & not introduced */
# define snprintf _snprintf
# endif
# if (_MSC_VER < 1500) && !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */
# define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
# endif
# else /* Other Windows compiller, old definition */
# define snprintf _snprintf
# define vsnprintf _vsnprintf
# endif
#endif #endif
#endif #endif