Browse Source

Android: Fix compatibility issues with some vendors

add tolower and toupper to be processed by ucd-tools in WCTYPE_H_COMPAT_SHIM

some vendors don't provide conformance with c standard in bionic
master
Beqa Gozalishvili 2 years ago
parent
commit
e3487d0cf8
2 changed files with 5 additions and 2 deletions
  1. 3
    2
      android/jni/Android.mk
  2. 2
    0
      src/include/compat/wctype.h

+ 3
- 2
android/jni/Android.mk View File

@@ -55,7 +55,7 @@ ESPEAK_SRC_PATH := ../../src
ESPEAK_SRC_FILES := \
$(subst src/,$(ESPEAK_SRC_PATH)/,$(ESPEAK_SOURCES))

LOCAL_CFLAGS += -DINCLUDE_KLATT -DINCLUDE_SPEECHPLAYER -DINCLUDE_SONIC
LOCAL_CFLAGS += -DINCLUDE_KLATT -DINCLUDE_SPEECHPLAYER -DINCLUDE_SONIC -DHAVE_ENDIAN_H
LOCAL_SRC_FILES += \
$(filter-out $(BLACKLIST_SRC_FILES),$(ESPEAK_SRC_FILES))

@@ -70,7 +70,8 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/$(UCDTOOLS_SRC_PATH)/include \
$(LOCAL_PATH)/../../src/speechPlayer/include \
$(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/include
$(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/include \
$(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/include/compat

LOCAL_LDLIBS := \
-llog

+ 2
- 0
src/include/compat/wctype.h View File

@@ -44,5 +44,7 @@
#define iswspace ucd_isspace
#define iswupper ucd_isupper
#define iswxdigit ucd_isxdigit
#define tolower ucd_tolower
#define toupper udc_toupper

#endif

Loading…
Cancel
Save