diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 2 | ||||
| -rwxr-xr-x | src/3rdparty/sha3/KeccakF-1600-opt32.c | 8 | ||||
| -rw-r--r-- | src/testlib/3rdparty/valgrind_p.h | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index d8f7d44887..e351dbfd49 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -261,7 +261,7 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item) for (int lgi = 0; lgi < lgn; lgi++) { if ( rglyphs[lgi] == 0xdd/*TH_BLANK_BASE_GLYPH*/ ) { glyphString[slen++] = C_DOTTED_CIRCLE; - } else if (cstr[i] == (signed char)~0) { + } else if ((unsigned char)cstr[i] == (unsigned char)~0) { // The only glyphs that should be passed to this function that cannot be mapped to // tis620 are the ones of type Inherited class. Pass these glyphs untouched. glyphString[slen++] = string[i]; diff --git a/src/3rdparty/sha3/KeccakF-1600-opt32.c b/src/3rdparty/sha3/KeccakF-1600-opt32.c index b1b442c7e0..4e32dca9cb 100755 --- a/src/3rdparty/sha3/KeccakF-1600-opt32.c +++ b/src/3rdparty/sha3/KeccakF-1600-opt32.c @@ -114,8 +114,8 @@ static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32 even, UINT32 odd) const UINT32 * pI = (const UINT32 *)input; \ UINT32 * pS = state; \ UINT32 t, x0, x1; \ - int i; \ - for (i = (rateInLanes)-1; i >= 0; --i) \ + int i; \ + for (i = (int)(rateInLanes)-1; i >= 0; --i) \ { \ x0 = *(pI++); \ t = (x0 ^ (x0 >> 1)) & 0x22222222UL; x0 = x0 ^ t ^ (t << 1); \ @@ -170,7 +170,7 @@ static void xor8bytesIntoInterleavedWords(UINT32* evenAndOdd, const UINT8* sourc #define xorLanesIntoState(laneCount, state, input) \ { \ - int i; \ + unsigned i; \ for(i=0; i<(laneCount); i++) \ xor8bytesIntoInterleavedWords(state+i*2, input+i*8); \ } @@ -212,7 +212,7 @@ static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32* evenAndOdd) #define extractLanes(laneCount, state, data) \ { \ - int i; \ + unsigned i; \ for(i=0; i<(laneCount); i++) \ setInterleavedWordsInto8bytes(data+i*8, (UINT32*)state+i*2); \ } diff --git a/src/testlib/3rdparty/valgrind_p.h b/src/testlib/3rdparty/valgrind_p.h index bbce1b24d6..4745371d81 100644 --- a/src/testlib/3rdparty/valgrind_p.h +++ b/src/testlib/3rdparty/valgrind_p.h @@ -133,6 +133,7 @@ _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ { \ (_zzq_rlval) = (_zzq_default); \ + (void)_zzq_rlval; \ } #else /* ! NVALGRIND */ @@ -205,6 +206,7 @@ typedef : "cc", "memory" \ ); \ _zzq_rlval = _zzq_result; \ + (void)_zzq_rlval; \ } #define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ @@ -319,6 +321,7 @@ typedef : "b" (_zzq_default), "b" (_zzq_ptr) \ : "cc", "memory", "r3", "r4"); \ _zzq_rlval = _zzq_result; \ + (void)_zzq_rlval; \ } #define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ @@ -377,6 +380,7 @@ typedef : "0" (_zzq_default), "r" (_zzq_ptr) \ : "cc", "memory"); \ _zzq_rlval = _zzq_result; \ + (void)_zzq_rlval; \ } #define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ @@ -447,6 +451,7 @@ typedef : "b" (_zzq_ptr) \ : "r3", "r4", "cc", "memory"); \ _zzq_rlval = _zzq_result; \ + (void)_zzq_rlval; \ } #define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ @@ -519,6 +524,7 @@ typedef : "b" (_zzq_ptr) \ : "r3", "r4", "cc", "memory"); \ _zzq_rlval = _zzq_result; \ + (void)_zzq_rlval; \ } #define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ |