Fixed glibc2.0 check (for that glibc2.0 workaround, which gives glibc2.1

warnings instead, since __ctype_tolower/upper is not declared there)
Added declarations for wxFprintf and wxVfprintf.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 963af6cdd0aff7112c565d17088727a16f73cb60..b09748469a0aac1a30106e74a3f8634cf871d52a 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -152,8 +152,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #define  wxIsupper   iswupper
 #define  wxIsxdigit  iswxdigit
 
 #define  wxIsupper   iswupper
 #define  wxIsxdigit  iswxdigit
 

-    // VZ: the test is incorrect, should test for glibc2.0 somehow probably
-#ifdef __GNUG__
+#if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)

     // /usr/include/wctype.h incorrectly declares translations tables which
     // provokes tons of compile-time warnings - try to correct this
     #define  wxTolower(wc)   towctrans((wc), (wctrans_t)__ctype_tolower)
     // /usr/include/wctype.h incorrectly declares translations tables which
     // provokes tons of compile-time warnings - try to correct this
     #define  wxTolower(wc)   towctrans((wc), (wctrans_t)__ctype_tolower)


@@ -371,9 +370,12 @@ wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale);
 #endif
 
 #ifdef wxNEED_WX_STDIO_H
 #endif
 
 #ifdef wxNEED_WX_STDIO_H

+#include <stdio.h>

 #include <stdarg.h>
 int      WXDLLEXPORT wxPrintf(const wxChar *fmt, ...);
 int      WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr);
 #include <stdarg.h>
 int      WXDLLEXPORT wxPrintf(const wxChar *fmt, ...);
 int      WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr);

+int      WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...);
+int      WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr);

 int      WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...);
 int      WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
 #endif
 int      WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...);
 int      WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
 #endif