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

Committing in .

Browse Source 
Changes to make OpenVMS compile WX

 Modified Files:
 	wxWidgets/include/wx/wxcrt.h wxWidgets/include/wx/wxcrtbase.h
 	wxWidgets/src/common/wxcrt.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2007-06-15 12:52:25 +00:00
parent a33c7045d1
commit 28ffb1f22f
3 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/wxcrt.h
View File

@@ -420,11 +420,12 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
// call in wxStrcoll_String<T>()), so we have to forward-declare the template
// and implement it below WX_STRCMP_FUNC. OTOH, this fails to compile with VC6,
// so we do it for GCC only.
#ifdef __GNUG__
// The same is needed for HP CXX on OpenVMS
#if defined( __GNUG__ ) || defined( __VMS )
template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2);
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif // __GNUG__
#endif // __GNUG__ or __VMS
template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2)
@@ -440,7 +441,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
#endif
}
#ifndef __GNUG__
#if !defined( __GNUG__ ) && !defined( __VMS )
// this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif