From 6bc7b9138db63cd4ea58b00877d45acae44b6055 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 8 May 2008 13:57:54 +0000 Subject: [PATCH] don't redeclare vsscanf() for Windows compilers, the case of missing declaration for an existing function only arises under old Unix systems git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrtvararg.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h index 5516c5a083..77ffc5f0d7 100644 --- a/include/wx/wxcrtvararg.h +++ b/include/wx/wxcrtvararg.h @@ -31,9 +31,12 @@ /* printf() family saga */ /* - For some systems [v]snprintf()/vsscanf() exists in the system libraries but - not in the headers, so we need to declare it ourselves to be able to use it. + For many old Unix systems [v]snprintf()/vsscanf() exists in the system + 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) #ifdef __cplusplus extern "C" @@ -52,9 +55,6 @@ int snprintf(char *str, size_t size, const char *format, ...); #endif /* !HAVE_SNPRINTF_DECL */ -#ifdef __WATCOMC__ - #define HAVE_VSSCANF_DECL -#endif #if defined(HAVE_VSSCANF) && !defined(HAVE_VSSCANF_DECL) #ifdef __cplusplus extern "C" @@ -62,7 +62,7 @@ extern #endif 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 * same isn't done for snprintf below, the builtin wxSnprintf_ is used @@ -74,6 +74,8 @@ } #endif +#endif /* __UNIX__ */ + /* mingw32 normally uses MSVCRT which has non-standard vswprintf() and so normally _vsnwprintf() is used instead, the only exception is when mingw32