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

42
src/common/wxcrt.cpp
View File

@@ -600,8 +600,16 @@ int wxCRT_ScanfW(const wchar_t *format, ...)
va_list argptr;
va_start(argptr, format);
int ret = vwscanf(wxFormatConverter(format), argptr);
#ifdef __VMS
#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
int ret = std::vwscanf(wxFormatConverter(format), argptr);
#else
int ret = vwscanf(wxFormatConverter(format), argptr);
#endif
#else
int ret = vwscanf(wxFormatConverter(format), argptr);
#endif
va_end(argptr);
return ret;
@@ -614,7 +622,15 @@ int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...)
va_list argptr;
va_start(argptr, format);
int ret = vswscanf(str, wxFormatConverter(format), argptr);
#ifdef __VMS
#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
int ret = std::vswscanf(str, wxFormatConverter(format), argptr);
#else
int ret = vswscanf(str, wxFormatConverter(format), argptr);
#endif
#else
int ret = vswscanf(str, wxFormatConverter(format), argptr);
#endif
va_end(argptr);
@@ -627,7 +643,15 @@ int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...)
{
va_list argptr;
va_start(argptr, format);
int ret = vfwscanf(stream, wxFormatConverter(format), argptr);
#ifdef __VMS
#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
int ret = std::vfwscanf(stream, wxFormatConverter(format), argptr);
#else
int ret = vfwscanf(stream, wxFormatConverter(format), argptr);
#endif
#else
int ret = vfwscanf(stream, wxFormatConverter(format), argptr);
#endif
va_end(argptr);
@@ -638,7 +662,15 @@ int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...)
#ifndef wxCRT_VsscanfW
int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list argptr)
{
return vswscanf(str, wxFormatConverter(format), argptr);
#ifdef __VMS
#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
return std::vswscanf(str, wxFormatConverter(format), argptr);
#else
return vswscanf(str, wxFormatConverter(format), argptr);
#endif
#else
return vswscanf(str, wxFormatConverter(format), argptr);
#endif
}
#endif