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

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

Browse Source 
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
This commit is contained in:
Ove Kaaven
1999-04-13 10:21:42 +00:00
parent fe99e2858a
commit c1160779dc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/wxchar.h
View File

@@ -152,8 +152,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
#define wxIsupper iswupper #define wxIsupper iswupper
#define wxIsxdigit iswxdigit #define wxIsxdigit iswxdigit
// VZ: the test is incorrect, should test for glibc2.0 somehow probably #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
#ifdef __GNUG__
// /usr/include/wctype.h incorrectly declares translations tables which // /usr/include/wctype.h incorrectly declares translations tables which
// provokes tons of compile-time warnings - try to correct this // provokes tons of compile-time warnings - try to correct this
#define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower) #define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower)
@@ -371,9 +370,12 @@ wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale);
#endif #endif
#ifdef wxNEED_WX_STDIO_H #ifdef wxNEED_WX_STDIO_H
#include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...); int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...);
int WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr); 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 wxSprintf(wxChar *buf, const wxChar *fmt, ...);
int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr); int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
#endif #endif