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

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 17 May 2013 17:32:16 +0200
parents 5bae1ac18ded
children
line wrap: on
line source

--- i/glog-0.3.2/src/windows/port.cc	2011-08-30 09:56:13.000000000 +0200
+++ port.cc	2012-10-03 17:11:54.000000000 +0200
@@ -55,6 +55,7 @@
   return _vsnprintf(str, size-1, format, ap);
 }
 
+#if !defined(__MINGW32__)
 int snprintf(char *str, size_t size, const char *format, ...) {
   va_list ap;
   va_start(ap, format);
@@ -62,3 +63,4 @@
   va_end(ap);
   return r;
 }
+#endif