Index: ext/misc/json1.c ================================================================== --- ext/misc/json1.c +++ ext/misc/json1.c @@ -1834,15 +1834,15 @@ jsonAppendChar(pStr, ']'); if( pStr->bErr ){ if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx); assert( pStr->bStatic ); }else if( isFinal ){ - sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, + sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free); pStr->bStatic = 1; }else{ - sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT); + sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); pStr->nUsed--; } }else{ sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC); } @@ -1887,11 +1887,11 @@ }else if( z[i]=='\\' ){ i++; } } pStr->nUsed -= i; - memmove(&z[1], &z[i+1], pStr->nUsed-1); + memmove(&z[1], &z[i+1], (size_t)pStr->nUsed-1); } #else # define jsonGroupInverse 0 #endif @@ -1933,15 +1933,15 @@ jsonAppendChar(pStr, '}'); if( pStr->bErr ){ if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx); assert( pStr->bStatic ); }else if( isFinal ){ - sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, + sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free); pStr->bStatic = 1; }else{ - sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT); + sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); pStr->nUsed--; } }else{ sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC); } Index: ext/rtree/geopoly.c ================================================================== --- ext/rtree/geopoly.c +++ ext/rtree/geopoly.c @@ -178,11 +178,11 @@ continue; } break; } if( z[j-1]<'0' ) return 0; - if( pVal ) *pVal = atof((const char*)p->z); + if( pVal ) *pVal = (GeoCoord)atof((const char*)p->z); p->z += j; return 1; } /* @@ -433,12 +433,12 @@ int ii; if( p ){ for(ii=0; iinVertex; ii++){ x0 = p->a[ii*2]; y0 = p->a[ii*2+1]; - x1 = A*x0 + B*y0 + E; - y1 = C*x0 + D*y0 + F; + x1 = (GeoCoord)(A*x0 + B*y0 + E); + y1 = (GeoCoord)(C*x0 + D*y0 + F); p->a[ii*2] = x1; p->a[ii*2+1] = y1; } sqlite3_result_blob(context, p->hdr, 4+8*p->nVertex, SQLITE_TRANSIENT); @@ -509,15 +509,15 @@ int ii; mnX = mxX = p->a[0]; mnY = mxY = p->a[1]; for(ii=1; iinVertex; ii++){ double r = p->a[ii*2]; - if( rmxX ) mxX = r; + if( rmxX ) mxX = (float)r; r = p->a[ii*2+1]; - if( rmxY ) mxY = r; + if( rmxY ) mxY = (float)r; } if( pRc ) *pRc = SQLITE_OK; if( aCoord==0 ){ geopolyBboxFill: pOut = sqlite3_realloc(p, sizeof(GeoPoly)+sizeof(GeoCoord)*6); Index: ext/rtree/rtree.c ================================================================== --- ext/rtree/rtree.c +++ ext/rtree/rtree.c @@ -3271,11 +3271,11 @@ ** DROP TABLE ; -- Would fail with SQLITE_LOCKED ** COMMIT; */ static int rtreeSavepoint(sqlite3_vtab *pVtab, int iSavepoint){ Rtree *pRtree = (Rtree *)pVtab; - int iwt = pRtree->inWrTrans; + u8 iwt = pRtree->inWrTrans; UNUSED_PARAMETER(iSavepoint); pRtree->inWrTrans = 0; nodeBlobReset(pRtree); pRtree->inWrTrans = iwt; return SQLITE_OK; Index: src/memdb.c ================================================================== --- src/memdb.c +++ src/memdb.c @@ -14,12 +14,12 @@ ** block of memory. ** ** This file also implements interface sqlite3_serialize() and ** sqlite3_deserialize(). */ -#ifdef SQLITE_ENABLE_DESERIALIZE #include "sqliteInt.h" +#ifdef SQLITE_ENABLE_DESERIALIZE /* ** Forward declaration of objects used by this utility */ typedef struct sqlite3_vfs MemVfs;