From d4ea46dbad078ea99924c056796e032fa9a36e7a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 27 Aug 2002 08:56:50 +0000 Subject: [PATCH] (blind) fix for BC++ compilation problem with wxPutc() redefinition git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxchar.h | 2 ++ src/common/wxchar.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 6b82bc62f4..3aaa9ba0b6 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -396,6 +396,8 @@ #define wxPuts putws #define wxFputs fputws #else + #define wxNEED_FPUTWC + #include int wxFputs(const wxChar *ch, FILE *stream); diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index c19ed120c7..7f532e5b36 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -451,7 +451,7 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) // implement the standard IO functions for wide char if libc doesn't have them // ---------------------------------------------------------------------------- -#ifndef HAVE_FPUTWC +#ifdef wxNEED_FPUTWC int wxFputs(const wchar_t *ws, FILE *stream) { @@ -467,7 +467,7 @@ int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream) return wxFputs(ws, stream); } -#endif // HAVE_FPUTWC +#endif // wxNEED_FPUTWC // NB: we only implement va_list functions here, the ones taking ... are // defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse