cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the vsprintf() problem once and for all

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1998-11-25 12:13:54 +00:00
parent 6164d85e89
commit a38b83c353
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/string.cpp
View File

@ -101,6 +101,24 @@ extern const char *g_szNul = &g_strEmpty.dummy;
#define NAMESPACE std:: #define NAMESPACE std::
#endif #endif
#ifdef __WXMSW__
#ifdef _MSC_VER
#define wxVsprintf _vsnprintf
#endif
#else
#if defined ( HAVE_VSNPRINTF )
#define wxVsprintf vsnprintf
#endif
#endif
#ifndef wxVsprintf
#ifdef HAVE_VPRINTF
#define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
#pragma message("Using sprintf() because no snprintf()-like function defined")
#else
#pragma error("No vsnprintf() or vsprintf() function available.")
#endif
#endif
NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
{ {
@ -932,19 +950,6 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
return iLen; return iLen;
#else #else
#ifdef __WXMSW__
#ifdef _MSC_VER
#define wxVsprintf _vsnprintf
#endif
#else // guess that any Unix has snprintf() - feel free to insert additional
// platform/compiler tests here if this is not the case for you
#define wxVsprintf vsnprintf
#endif
#ifndef wxVsprintf
#pragma message("Using sprintf() because no snprintf()-like function defined")
#define wxVsprintf vsprintf
#endif
// static buffer to avoid dynamic memory allocation each time // static buffer to avoid dynamic memory allocation each time
static char s_szScratch[1024]; static char s_szScratch[1024];