mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-04 14:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag '1.48.07' into android

Browse Source
This commit is contained in:
Reece H. Dunn
2014-08-09 13:29:39 +01:00
parent 092318d4df 4f093cdfc3
commit a11c2f01b3
20 changed files with 408 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiledata.cpp
+3 -2
View File
@@ -214,7 +214,7 @@ enum {
kTUNE_SPLIT,
};
static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static unsigned const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static keywtab_t k_intonation[] = {
{"tune", 0, kTUNE},
@@ -256,7 +256,7 @@ static keywtab_t keywords[] = {
{"phonemenumber",tSTATEMENT, kPHONEMENUMBER},
{"phonemetable",tSTATEMENT, kPHONEMETABLE},
{"include", tSTATEMENT, kINCLUDE},
{utf8_bom, tSTATEMENT, kUTF8_BOM},
{(const char *)utf8_bom, tSTATEMENT, kUTF8_BOM},
{"phoneme", tSTATEMENT, kPHONEMESTART},
{"procedure", tSTATEMENT, kPROCEDURE},
@@ -3499,6 +3499,7 @@ static void CompilePhonemeFiles()
f_in = f;
strncpy0(current_fname,item_string,sizeof(current_fname));
linenum = 1;
}
else
{
src/espeakedit.cpp
+1 -1
View File
@@ -743,7 +743,7 @@ void MyFrame::OnTools(wxCommandEvent& event)
int debug_flag=0;
char fname_log[sizeof(path_dsource)+12];
char err_fname[sizeof(path_home)+15];
static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static unsigned const char utf8_bom[] = {0xef,0xbb,0xbf,0};
switch(event.GetId())
{