summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp4
-rw-r--r--src/assistant/clucene/qclucene-config_p.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
index 62cecb78b..2d9b5be0c 100644
--- a/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
@@ -100,7 +100,11 @@ void lucene_vfnwprintf(StringBuffer* buffer, size_t count, const wchar_t * forma
size_t v;
size_t len = tmp->length();
for (size_t i=0;i<len;i++){
+#if !defined(__ANDROID__) && !defined(ANDROID)
v = wctomb(ob,*pointer);
+#else
+ v = wcrtomb(ob,*pointer,0);
+#endif // __ANDROID__
if ( v > 0 ){
ob[v]='\0';
fputs(ob,stdout);
diff --git a/src/assistant/clucene/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
index 4b098bcf5..f3531a64a 100644
--- a/src/assistant/clucene/qclucene-config_p.h
+++ b/src/assistant/clucene/qclucene-config_p.h
@@ -416,7 +416,7 @@ configure.
#define _CL_HAVE_WCSTOD 1
#endif
-#if !defined(__SUNPRO_CC) && !defined(__SUNPRO_C) && !defined(__HP_aCC)
+#if !defined(__SUNPRO_CC) && !defined(__SUNPRO_C) && !defined(__HP_aCC) && !defined(Q_OS_ANDROID)
/* Define to 1 if you have the `wcstoll' function. */
# ifndef _CL_HAVE_WCSTOLL
# define _CL_HAVE_WCSTOLL 1