From 68ec09ab574825fde02b6df93596bfa19b737fbf Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 22 Dec 2012 10:08:42 +0000 Subject: [PATCH] Use the ucd-tools toupper/tolower APIs instead of the Android versions. --- android/jni/Android.mk | 1 + src/android_wchar.h | 3 +++ ucd-tools | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 0debcecb..45efb5af 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -23,6 +23,7 @@ BLACKLIST_SRC_FILES := \ ESPEAK_SRC_PATH := ../../src ESPEAK_SRC_FILES := \ + $(LOCAL_PATH)/../../../ucd-tools/src/case.cpp \ $(LOCAL_PATH)/../../../ucd-tools/src/categories.cpp \ $(LOCAL_PATH)/../../../ucd-tools/src/ctype.cpp \ $(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*)) diff --git a/src/android_wchar.h b/src/android_wchar.h index 1fc3f01f..8876fec3 100644 --- a/src/android_wchar.h +++ b/src/android_wchar.h @@ -36,5 +36,8 @@ #define iswspace(c) ucd::isspace(c) #define iswupper(c) ucd::isupper(c) +#define towlower(c) ucd::tolower(c) +#define towupper(c) ucd::toupper(c) + #endif #endif diff --git a/ucd-tools b/ucd-tools index e3e85d33..9c3a87db 160000 --- a/ucd-tools +++ b/ucd-tools @@ -1 +1 @@ -Subproject commit e3e85d33f2949cdb29fa1090c0165d6117aa9217 +Subproject commit 9c3a87dbebe7547edd0125f59a581284d5d8dd80