From a2c5db764c8450dda6e87fe58917b0a00ec2c74f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 22 Jul 2007 08:01:51 +0000 Subject: [PATCH] fixed visibility warning on Fedora git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrt.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 0083ee1585..04fffe5a44 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -419,8 +419,9 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) // the template's implementation uses overloaded function declared later (see // the wxStrcoll() call in wxStrcoll_String()), so we have to // forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, -// this fails to compile with VC6, so don't do it for VC. -#if !defined(__VISUALC__) +// this fails to compile with VC6, so don't do it for VC. It also causes +// problems with GCC visibility in newer GCC versions. +#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4)) template inline int wxStrcoll_String(const wxString& s1, const T& s2); WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) @@ -440,7 +441,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2) #endif } -#if defined(__VISUALC__) +#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4) // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<> WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) #endif -- 2.50.0