fixed Win32 build (VS2010)

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1050 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-12 22:36:56 +00:00
parent a4061275c2
commit 1c3f78f2d6
15 changed files with 135 additions and 60 deletions

View File

@@ -258,18 +258,14 @@ std::string uFormatv (const char *fmt, va_list args)
va_list argsTmp;
while (1) {
va_copy(argsTmp, args);
#if defined(WIN32) && !defined(__MINGW32__)
argsTmp = args;
#else
va_copy(argsTmp, args);
#endif
// Try to vsnprintf into our buffer.
int needed;
if(argsTmp != 0)
{
needed = vsnprintf (buf, size, fmt, argsTmp);
}
else
{
needed = snprintf (buf, size, "%s", fmt);
}
int needed = vsnprintf (buf, size, fmt, argsTmp);
va_end(argsTmp);
// NB. C99 (which modern Linux and OS X follow) says vsnprintf
// failure returns the length it would have needed. But older