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

Forgot to put the previous (v)snprintf commit inside '#ifdef __cplusplus' which

Browse Source 
is needed for the inline function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-09-07 19:49:39 +00:00
parent 62fa8b3a1d
commit 3f3a6949a6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/wxchar.h
View File

@@ -805,7 +805,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
/* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the /* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
* same isn't done for snprintf below, the builtin wxSnprintf_ is used * same isn't done for snprintf below, the builtin wxSnprintf_ is used
* instead since it's already a simple wrapper */ * instead since it's already a simple wrapper */
#ifdef HAVE_BROKEN_VSNPRINTF_DECL #if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap) inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
{ {
return vsnprintf(str, size, (char*)format, ap); return vsnprintf(str, size, (char*)format, ap);
@@ -846,10 +846,10 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
#endif #endif
#endif #endif
#if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__) #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
#ifndef HAVE_BROKEN_VSNPRINTF_DECL #if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
#define wxVsnprintf_ vsnprintf
#else
#define wxVsnprintf_ wx_fixed_vsnprintf #define wxVsnprintf_ wx_fixed_vsnprintf
#else
#define wxVsnprintf_ vsnprintf
#endif #endif
#endif #endif
#endif #endif