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

don't redeclare vsscanf() for Windows compilers, the case of missing declaration for an existing function only arises under old Unix systems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-08 13:57:54 +00:00
parent 1df90f2dbc
commit 6bc7b9138d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/wxcrtvararg.h
View File

@@ -31,9 +31,12 @@
/* printf() family saga */ /* printf() family saga */
/* /*
For some systems [v]snprintf()/vsscanf() exists in the system libraries but For many old Unix systems [v]snprintf()/vsscanf() exists in the system
not in the headers, so we need to declare it ourselves to be able to use it. libraries but not in the headers, so we need to declare it ourselves to be
able to use it.
*/ */
#ifdef __UNIX__
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL) #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@@ -52,9 +55,6 @@
int snprintf(char *str, size_t size, const char *format, ...); int snprintf(char *str, size_t size, const char *format, ...);
#endif /* !HAVE_SNPRINTF_DECL */ #endif /* !HAVE_SNPRINTF_DECL */
#ifdef __WATCOMC__
#define HAVE_VSSCANF_DECL
#endif
#if defined(HAVE_VSSCANF) && !defined(HAVE_VSSCANF_DECL) #if defined(HAVE_VSSCANF) && !defined(HAVE_VSSCANF_DECL)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@@ -62,7 +62,7 @@
extern extern
#endif #endif
int vsscanf(const char *str, const char *format, va_list ap); int vsscanf(const char *str, const char *format, va_list ap);
#endif /* !HAVE_SNPRINTF_DECL */ #endif /* !HAVE_VSSCANF_DECL */
/* 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
@@ -74,6 +74,8 @@
} }
#endif #endif
#endif /* __UNIX__ */
/* /*
mingw32 normally uses MSVCRT which has non-standard vswprintf() and so mingw32 normally uses MSVCRT which has non-standard vswprintf() and so
normally _vsnwprintf() is used instead, the only exception is when mingw32 normally _vsnwprintf() is used instead, the only exception is when mingw32