Merge branch 'master' of https://github.com/espeak-ng/espeak-ng

Makefile.am

@@ -127,12 +127,17 @@ lib_LTLIBRARIES += src/libespeak-ng.la
 src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm \
 	${PCAUDIOLIB_LIBS}
 
-src_libespeak_ng_la_CFLAGS = -Isrc/include -Isrc/include/compat \
+src_libespeak_ng_la_CFLAGS = -Isrc/include -Isrc/include/compat -I src/ucd-tools/src/include \
 	-fPIC -fvisibility=hidden -D _BSD_SOURCE -D_DEFAULT_SOURCE -D _POSIX_C_SOURCE=200112L \
 	-pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -DLIBESPEAK_NG_EXPORT \
 	${PCAUDIOLIB_CFLAGS} ${AM_CFLAGS}
 
 src_libespeak_ng_la_SOURCES = \
+	src/ucd-tools/src/case.c \
+	src/ucd-tools/src/categories.c \
+	src/ucd-tools/src/ctype.c \
+	src/ucd-tools/src/scripts.c \
+	src/ucd-tools/src/tostring.c \
 	src/libespeak-ng/compiledata.c \
 	src/libespeak-ng/compiledict.c \
 	src/libespeak-ng/compilembrola.c \

src/include/compat/stdint.h

@@ -45,12 +45,10 @@
 
 #pragma GCC system_header // Silence "warning: #include_next is a GCC extension"
 
-#if defined(HAVE_STDINT_H)
+#if defined(HAVE_STDINT_H) || !defined(HAVE_INTTYPES_H)
 #include_next <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-#include_next <inttypes.h>
 #else
-#error stdint.h compatibility is not supported on this platform
+#include_next <inttypes.h>
 #endif
 
 #endif

src/libespeak-ng/compiledict.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/dictionary.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/fifo.c

@@ -29,7 +29,6 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
 
 #include <espeak-ng/espeak_ng.h>
 

src/libespeak-ng/intonation.c

@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/numbers.c

@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>

src/libespeak-ng/setlengths.c

@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/synth_mbrola.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/synthdata.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/synthesize.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/tr_languages.c

@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>

src/libespeak-ng/voices.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <wctype.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>