solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix linking errors related to android_wcsto* functions.

Browse source
This commit is contained in:
Alex Shvartzkop 2024-02-11 04:01:18 +03:00
parent 85cc2acd6f
commit b4f435cbe8
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wx/wxcrtbase.h
View file

@ -160,9 +160,9 @@
#ifdef __ANDROID__ // these functions are broken on android #ifdef __ANDROID__ // these functions are broken on android
extern double android_wcstod(const wchar_t *nptr, wchar_t **endptr); WXDLLIMPEXP_BASE double android_wcstod(const wchar_t *nptr, wchar_t **endptr);
extern long android_wcstol(const wchar_t *nptr, wchar_t **endptr, int base); WXDLLIMPEXP_BASE long android_wcstol(const wchar_t *nptr, wchar_t **endptr, int base);
extern unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int base); WXDLLIMPEXP_BASE unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int base);
#define wxCRT_StrtodW android_wcstod #define wxCRT_StrtodW android_wcstod
#define wxCRT_StrtolW android_wcstol #define wxCRT_StrtolW android_wcstol

6
src/common/wxcrt.cpp
View file

@ -1219,21 +1219,21 @@ int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap)
} \ } \
return d; return d;
long android_wcstol(const wchar_t *nptr, wchar_t **endptr, int base) WXDLLEXPORT long android_wcstol(const wchar_t *nptr, wchar_t **endptr, int base)
{ {
ANDROID_WCSTO_START ANDROID_WCSTO_START
long d = strtol(dst, &dstendp, base); long d = strtol(dst, &dstendp, base);
ANDROID_WCSTO_END ANDROID_WCSTO_END
} }
unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int base) WXDLLEXPORT unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int base)
{ {
ANDROID_WCSTO_START ANDROID_WCSTO_START
unsigned long d = strtoul(dst, &dstendp, base); unsigned long d = strtoul(dst, &dstendp, base);
ANDROID_WCSTO_END ANDROID_WCSTO_END
} }
double android_wcstod(const wchar_t *nptr, wchar_t **endptr) WXDLLEXPORT double android_wcstod(const wchar_t *nptr, wchar_t **endptr)
{ {
ANDROID_WCSTO_START ANDROID_WCSTO_START
double d = strtod(dst, &dstendp); double d = strtod(dst, &dstendp);