navit/navit-0.5.6-espeak-fix-multiple-definitions.patch

59 lines
1.8 KiB
Diff
Raw Normal View History

--- navit-0.5.6/navit/support/espeak/espeak.c.orig 2021-12-04 17:40:47.205979646 +0100
+++ navit-0.5.6/navit/support/espeak/espeak.c 2021-12-04 17:41:06.501330463 +0100
@@ -102,7 +102,7 @@
char wavefile[200];
-int GetFileLength(const char *filename)
+/*int GetFileLength(const char *filename)
{//====================================
struct stat statbuf;
@@ -114,7 +114,7 @@
return(statbuf.st_size);
} // end of GetFileLength
-
+*/
void strncpy0(char *dest, const char *source, int size)
{//====================================================
--- navit-0.5.6/navit/support/espeak/dictionary.c.orig 2021-12-04 17:39:49.418929674 +0100
+++ navit-0.5.6/navit/support/espeak/dictionary.c 2021-12-04 17:40:01.918156691 +0100
@@ -80,7 +80,7 @@
-void strncpy0(char *to,const char *from, int size)
+void strncpy1(char *to,const char *from, int size)
{//===================================================
// strcpy with limit, ensures a zero terminator
strncpy(to,from,size);
@@ -3101,7 +3101,7 @@
word1 = word;
if(tr->transpose_min > 0)
{
- strncpy0(word_buf,word, N_WORD_BYTES);
+ strncpy1(word_buf,word, N_WORD_BYTES);
wlen = TransposeAlphabet(tr, word_buf); // bit 6 indicates compressed characters
word = word_buf;
}
@@ -3493,7 +3493,7 @@
}
else
{
- strncpy0(tr->phonemes_repeat, ph_out, sizeof(tr->phonemes_repeat));
+ strncpy1(tr->phonemes_repeat, ph_out, sizeof(tr->phonemes_repeat));
tr->phonemes_repeat_count = 1;
}
}
@@ -3597,7 +3597,7 @@
say_as = option_sayas;
option_sayas = 0; // don't speak replacement word as letter names
text[0] = 0;
- strncpy0(&(text[1]), word1, sizeof(text)-2);
+ strncpy1(&(text[1]), word1, sizeof(text)-2);
found = TranslateWord(tr, &text[1], 0, NULL, NULL);
strcpy(ph_out, word_phonemes);
option_sayas = say_as;