Sync trunk (rr49606)

svn path=/branches/cmake-bringup/; revision=49607
This commit is contained in:
Timo Kreuzer 2010-11-16 13:43:39 +00:00
commit 406dfdbc87
324 changed files with 15065 additions and 2892 deletions

View file

@ -392,6 +392,7 @@ static inline int pf_output_format_A( pf_output *out, LPCSTR str,
return r;
}
#ifndef USE_NEW_SPRINTF
static int pf_handle_string_format( pf_output *out, const void* str, int len,
pf_flags *flags, BOOL capital_letter)
{
@ -883,6 +884,7 @@ int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args )
return _vsnwprintf( str, INT_MAX, format, args );
}
#endif
#endif
/*********************************************************************
* wcscoll (MSVCRT.@)