(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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6b82bc62f406e7755e8c5f88b18cb117799e02e2..3aaa9ba0b635d74fce565f90f14ede20fb4d7b9e 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -396,6 +396,8 @@
                 #define  wxPuts      putws
                 #define  wxFputs     fputws
             #else
                 #define  wxPuts      putws
                 #define  wxFputs     fputws
             #else

+                #define wxNEED_FPUTWC
+

                 #include <stdio.h>
 
                 int wxFputs(const wxChar *ch, FILE *stream);
                 #include <stdio.h>
 
                 int wxFputs(const wxChar *ch, FILE *stream);

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index c19ed120c72541a67c47724be584649a7f777447..7f532e5b363d7040c4a909c0ce3f3e5ed06bec94 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // 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)
 {
 
 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);
 }
 
     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
 
 // NB: we only implement va_list functions here, the ones taking ... are
 //     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse