Mercurial > irccd

annotate extern/jansson/snprintf.patch @ 177:254bbc0f13b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc: dos2unix some files
author David Demelier <markand@malikania.fr>
date Thu, 26 May 2016 18:52:09 +0200
parents 2aecbd638b1c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
177
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
1 diff --git a/cmake/jansson_private_config.h.cmake b/cmake/jansson_private_config.h.cmake
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
2 index ee1078f..ac7318f 100644
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
3 --- a/cmake/jansson_private_config.h.cmake
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
4 +++ b/cmake/jansson_private_config.h.cmake
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
5 @@ -49,6 +49,20 @@
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
6
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
7 #cmakedefine HAVE_SNPRINTF 1
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
8
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
9 +/* snprintf should not be defined as macro with MSC_VER >= 1900 */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
10 +#if defined(_WIN32) || defined(WIN32)
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
11 +# if defined(_MSC_VER) /* MS compiller */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
12 +# if (_MSC_VER < 1900) /* snprintf not introduced */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
13 +# if !defined(snprintf)
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
14 +# define snprintf _snprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
15 +# define HAVE_SNPRINTF 1 /* snprintf defined manually */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
16 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
17 +# else
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
18 +# define HAVE_SNPRINTF 1 /* snprintf available via sdk */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
19 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
20 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
21 +#endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
22 +
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
23 #ifndef HAVE_SNPRINTF
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
24 # define snprintf @JSON_SNPRINTF@
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
25 #endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
26 diff --git a/src/jansson_private.h b/src/jansson_private.h
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
27 index e100726..ccb3a57 100644
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
28 --- a/src/jansson_private.h
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
29 +++ b/src/jansson_private.h
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
30 @@ -90,10 +90,20 @@ char *jsonp_strndup(const char *str, size_t length);
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
31 char *jsonp_strdup(const char *str);
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
32 char *jsonp_strndup(const char *str, size_t len);
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
33
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
34 +
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
35 /* Windows compatibility */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
36 -#ifdef _WIN32
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
37 -#define snprintf _snprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
38 -#define vsnprintf _vsnprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
39 +#if defined(_WIN32) || defined(WIN32)
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
40 +# if defined(_MSC_VER) /* MS compiller */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
41 +# if (_MSC_VER < 1900) && !defined(snprintf) /* snprintf not defined yet & not introduced */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
42 +# define snprintf _snprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
43 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
44 +# if (_MSC_VER < 1500) && !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
45 +# define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
46 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
47 +# else /* Other Windows compiller, old definition */
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
48 +# define snprintf _snprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
49 +# define vsnprintf _vsnprintf
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
50 +# endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
51 #endif
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
52
254bbc0f13b5 Misc: dos2unix some files
David Demelier <markand@malikania.fr>
parents: 122
diff changeset
53 #endif