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

compilation fix if wxLongLong_t is not available

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-25 17:53:30 +00:00
parent 28efe6544f
commit bdcb213757
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/wxcrt.h
View File

@@ -832,8 +832,10 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW) WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW)
WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW) WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW)
#ifdef wxLongLong_t
WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW) WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW)
WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW) WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW)
#endif // wxLongLong_t
#undef WX_STRTOX_FUNC #undef WX_STRTOX_FUNC

18
include/wx/wxcrtbase.h
View File

@@ -369,14 +369,24 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
#endif #endif
/* supply strtoll and strtoull, if needed */ /* supply strtoll and strtoull, if needed */
#ifdef wxLongLong_t
#ifndef wxCRT_StrtollA #ifndef wxCRT_StrtollA
WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr, char** endptr, int base); WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr,
WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr, char** endptr, int base); char** endptr,
int base);
WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr,
char** endptr,
int base);
#endif #endif
#ifndef wxCRT_StrtollW #ifndef wxCRT_StrtollW
WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr, wchar_t** endptr, int base); WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr,
WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base); wchar_t** endptr,
int base);
WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr,
wchar_t** endptr,
int base);
#endif #endif
#endif // wxLongLong_t
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------

3
src/common/wxcrt.cpp
View File

@@ -866,6 +866,7 @@ wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
#ifdef wxLongLong_t
template<typename T> template<typename T>
static wxULongLong_t static wxULongLong_t
wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign) wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
@@ -1019,6 +1020,8 @@ wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base)
{ return wxCRT_DoStrtoull(nptr, endptr, base); } { return wxCRT_DoStrtoull(nptr, endptr, base); }
#endif #endif
#endif // wxLongLong_t
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// functions which we may need even if !wxUSE_WCHAR_T // functions which we may need even if !wxUSE_WCHAR_T
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------