Mercurial > hg > orthanc

annotate Resources/Patches/glog-port-cc.diff @ 445:7816aaa5db17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 17 May 2013 17:32:16 +0200
parents 5bae1ac18ded
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
105
jodogne
parents:
diff changeset
1 --- i/glog-0.3.2/src/windows/port.cc 2011-08-30 09:56:13.000000000 +0200
jodogne
parents:
diff changeset
2 +++ port.cc 2012-10-03 17:11:54.000000000 +0200
jodogne
parents:
diff changeset
3 @@ -55,6 +55,7 @@
jodogne
parents:
diff changeset
4 return _vsnprintf(str, size-1, format, ap);
jodogne
parents:
diff changeset
5 }
jodogne
parents:
diff changeset
6
jodogne
parents:
diff changeset
7 +#if !defined(__MINGW32__)
jodogne
parents:
diff changeset
8 int snprintf(char *str, size_t size, const char *format, ...) {
jodogne
parents:
diff changeset
9 va_list ap;
jodogne
parents:
diff changeset
10 va_start(ap, format);
jodogne
parents:
diff changeset
11 @@ -62,3 +63,4 @@
jodogne
parents:
diff changeset
12 va_end(ap);
jodogne
parents:
diff changeset
13 return r;
jodogne
parents:
diff changeset
14 }
jodogne
parents:
diff changeset
15 +#endif