From 7d7c43c4c3de2db7000a98cee109b93bb328c582 Mon Sep 17 00:00:00 2001
From: dsr <bdbcat@yahoo.com>
Date: Mon, 25 Jan 2021 21:44:17 -0500
Subject: [PATCH] Use localeconv() under Android, it's available there now

As of NDK21d, localeconv() is available under Android and can be used in
wxQt there.
---
 src/common/intl.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 44c4df22a8..df38f5d8ee 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1897,8 +1897,6 @@ wxString GetDateFormatFromLangInfo(wxLocaleInfo index)
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 {
-// TODO: as of 2014 Android doesn't has complete locale support (use java api)
-#if !(defined(__WXQT__) && defined(__ANDROID__))
     lconv * const lc = localeconv();
     if ( !lc )
         return wxString();
@@ -1940,7 +1938,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
         default:
             wxFAIL_MSG( "unknown wxLocaleInfo value" );
     }
-#endif
+
     return wxString();
 }