Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 13:34:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

revert sqlite3 changes, update version detection to silence warnings on OSX clang++ 3.0 (issue #480)

Browse Source
This commit is contained in:
Trammell Hudson 2015-11-28 09:06:30 -05:00
parent 842874f030
commit 74db76d146
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/sqlite3/sqlite3.c vendored
View File

@ -66815,7 +66815,7 @@ static int vdbeRecordCompareWithSkip(
/* RHS is a string */
else if( pRhs->flags & MEM_Str ){
(void) getVarint32(&aKey1[idx1], serial_type);
getVarint32(&aKey1[idx1], serial_type);
testcase( serial_type==12 );
if( serial_type<12 ){
rc = -1;
@ -66846,7 +66846,7 @@ static int vdbeRecordCompareWithSkip(
/* RHS is a blob */
else if( pRhs->flags & MEM_Blob ){
(void) getVarint32(&aKey1[idx1], serial_type);
getVarint32(&aKey1[idx1], serial_type);
testcase( serial_type==12 );
if( serial_type<12 || (serial_type & 0x01) ){
rc = -1;
@ -67016,7 +67016,7 @@ static int vdbeRecordCompareString(
int serial_type;
int res;
(void) getVarint32(&aKey1[1], serial_type);
getVarint32(&aKey1[1], serial_type);
if( serial_type<12 ){
res = pPKey2->r1; /* (pKey1/nKey1) is a number or a null */
}else if( !(serial_type & 0x01) ){

2
scripts/genie.lua
View File

@ -998,7 +998,7 @@ end
"-Wno-tautological-compare",
"-Wno-dynamic-class-memaccess",
}
if (version >= 30200) then
if (version >= 30000) then
buildoptions {
"-Wno-unused-value",
}