diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index f3a204953b..00e539fe93 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -160,9 +160,9 @@ #ifdef __ANDROID__ // these functions are broken on android -extern double android_wcstod(const wchar_t *nptr, wchar_t **endptr); -extern 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 double android_wcstod(const wchar_t *nptr, wchar_t **endptr); +WXDLLIMPEXP_BASE long android_wcstol(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_StrtolW android_wcstol diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index c0511899a6..0ac39ad494 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -1219,21 +1219,21 @@ int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap) } \ 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 long d = strtol(dst, &dstendp, base); 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 unsigned long d = strtoul(dst, &dstendp, base); 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 double d = strtod(dst, &dstendp);