Mercurial > embed
annotate jansson/patch/snprintf.patch @ 11:5d17168ea0af
gtest: import 1.7.0
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 22 Mar 2016 08:46:18 +0100 |
parents | 9870264521f7 |
children |
rev | line source |
---|---|
5
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 diff --git a/cmake/jansson_private_config.h.cmake b/cmake/jansson_private_config.h.cmake |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 index ee1078f..ac7318f 100644 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 --- a/cmake/jansson_private_config.h.cmake |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
4 +++ b/cmake/jansson_private_config.h.cmake |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 @@ -49,6 +49,20 @@ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 #cmakedefine HAVE_SNPRINTF 1 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 +/* snprintf should not be defined as macro with MSC_VER >= 1900 */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 +#if defined(_WIN32) || defined(WIN32) |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 +# if defined(_MSC_VER) /* MS compiller */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 +# if (_MSC_VER < 1900) /* snprintf not introduced */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 +# if !defined(snprintf) |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 +# define snprintf _snprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 +# define HAVE_SNPRINTF 1 /* snprintf defined manually */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 +# else |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 +# define HAVE_SNPRINTF 1 /* snprintf available via sdk */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 +#endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 + |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 #ifndef HAVE_SNPRINTF |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 # define snprintf @JSON_SNPRINTF@ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 #endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 diff --git a/src/jansson_private.h b/src/jansson_private.h |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 index e100726..ccb3a57 100644 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 --- a/src/jansson_private.h |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 +++ b/src/jansson_private.h |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
30 @@ -90,10 +90,20 @@ char *jsonp_strndup(const char *str, size_t length); |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 char *jsonp_strdup(const char *str); |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 char *jsonp_strndup(const char *str, size_t len); |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
34 + |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 /* Windows compatibility */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 -#ifdef _WIN32 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
37 -#define snprintf _snprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
38 -#define vsnprintf _vsnprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
39 +#if defined(_WIN32) || defined(WIN32) |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
40 +# if defined(_MSC_VER) /* MS compiller */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
41 +# if (_MSC_VER < 1900) && !defined(snprintf) /* snprintf not defined yet & not introduced */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
42 +# define snprintf _snprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
44 +# if (_MSC_VER < 1500) && !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 +# define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 +# else /* Other Windows compiller, old definition */ |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 +# define snprintf _snprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
49 +# define vsnprintf _vsnprintf |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
50 +# endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
51 #endif |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
52 |
9870264521f7
jansson: fix MSVC 2015 compilation
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
53 #endif |