Fix gcc sign conversion warnings in compilembrola.c.

This commit is contained in:
Reece H. Dunn
2016-01-10 13:52:54 +00:00
parent 0cc0300328
commit 8acf398d23
2 changed files with 4 additions and 6 deletions
+1 -3
View File
@@ -45,7 +45,6 @@ static unsigned int StringToWord(const char *string)
{
// Pack 4 characters into a word
int ix;
unsigned char c;
unsigned int word;
if (string == NULL)
@@ -54,8 +53,7 @@ static unsigned int StringToWord(const char *string)
word = 0;
for (ix = 0; ix < 4; ix++) {
if (string[ix] == 0) break;
c = string[ix];
word |= (c << (ix*8));
word |= ((unsigned int)string[ix] << (ix*8));
}
return word;
}
+3 -3
View File
@@ -355,10 +355,10 @@ typedef struct {
} SOUND_ICON;
typedef struct {
int name;
unsigned int name;
unsigned int next_phoneme;
int mbr_name;
int mbr_name2;
unsigned int mbr_name;
unsigned int mbr_name2;
int percent; // percentage length of first component
int control;
} MBROLA_TAB;