From f514bbcc8d1cf0c3937122300dccfb143cb450af Mon Sep 17 00:00:00 2001 From: Valdis Vitolins Date: Sun, 12 Apr 2020 12:37:23 +0300 Subject: [PATCH] =?UTF-8?q?Fix=20'implicit=20declaration=20of=20function?= =?UTF-8?q?=20=E2=80=98addPluralSuffixes=E2=80=99'=20C99/clang=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libespeak-ng/translate.c | 39 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index 9862a9bc..4d76e382 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -447,6 +447,26 @@ char *strchr_w(const char *s, int c) return strchr((char *)s, c); // (char *) is needed for Borland compiler } +// append plural suffixes depending on preceding letter +void addPluralSuffixes(int flags, Translator *tr, char last_char, char *word_phonemes) +{ + char word_zz[4] = { 0, 'z', 'z', 0 }; + char word_iz[4] = { 0, 'i', 'z', 0 }; + char word_ss[4] = { 0, 's', 's', 0 }; + if (flags & FLAG_HAS_PLURAL) { + // s or 's suffix, append [s], [z] or [Iz] depending on previous letter + if (last_char == 'f') + TranslateRules(tr, &word_ss[1], word_phonemes, N_WORD_PHONEMES, + NULL, 0, NULL); + else if ((last_char == 0) || (strchr_w("hsx", last_char) == NULL)) + TranslateRules(tr, &word_zz[1], word_phonemes, N_WORD_PHONEMES, + NULL, 0, NULL); + else + TranslateRules(tr, &word_iz[1], word_phonemes, N_WORD_PHONEMES, + NULL, 0, NULL); + } +} + static char *SpeakIndividualLetters(Translator *tr, char *word, char *phonemes, int spell_word) { int posn = 0; @@ -1141,25 +1161,6 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char return dictionary_flags[0]; } -// append plural suffixes depending on preceding letter -void addPluralSuffixes(int flags, Translator *tr, char last_char, char *word_phonemes) -{ - char word_zz[4] = { 0, 'z', 'z', 0 }; - char word_iz[4] = { 0, 'i', 'z', 0 }; - char word_ss[4] = { 0, 's', 's', 0 }; - if (flags & FLAG_HAS_PLURAL) { - // s or 's suffix, append [s], [z] or [Iz] depending on previous letter - if (last_char == 'f') - TranslateRules(tr, &word_ss[1], word_phonemes, N_WORD_PHONEMES, - NULL, 0, NULL); - else if ((last_char == 0) || (strchr_w("hsx", last_char) == NULL)) - TranslateRules(tr, &word_zz[1], word_phonemes, N_WORD_PHONEMES, - NULL, 0, NULL); - else - TranslateRules(tr, &word_iz[1], word_phonemes, N_WORD_PHONEMES, - NULL, 0, NULL); - } -} int TranslateWord(Translator *tr, char *word_start, WORD_TAB *wtab, char *word_out) {