retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

sqlite: fix build with -Werror 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11527 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-01-28 00:39:04 +00:00
parent c17a0a29f7
commit 1e1893165f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/sqlite/src/os.h
View File

@ -64,6 +64,7 @@
# define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
#else
# define SQLITE_TEMPNAME_SIZE 200
# include <unistd.h>
#endif
/* If the SET_FULLSYNC macro is not defined above, then make it

4
libs/sqlite/src/vdbemem.c
View File

@ -760,7 +760,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
pVal->flags |= (pVal->flags & MEM_Blob)>>3;
if( pVal->flags&MEM_Str ){
sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z) ){
if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)(intptr_t)pVal->z) ){
assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 );
if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){
return 0;
@ -770,7 +770,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
}else{
assert( (pVal->flags&MEM_Blob)==0 );
sqlite3VdbeMemStringify(pVal, enc);
assert( 0==(1&(int)pVal->z) );
assert( 0==(1&(int)(intptr_t)pVal->z) );
}
assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || sqlite3MallocFailed() );
if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){

5
libs/sqlite/src/vtab.c
View File

@ -15,6 +15,7 @@
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
#include "sqliteInt.h"
#include "os.h"
/*
** External API function used to create a new virtual-table module.
@ -562,7 +563,7 @@ int sqlite3VtabSync(sqlite3 *db, int rc2){
** sqlite3.aVTrans array. Then clear the array itself.
*/
int sqlite3VtabRollback(sqlite3 *db){
callFinaliser(db, (int)(&((sqlite3_module *)0)->xRollback));
callFinaliser(db, (int)(intptr_t)(&((sqlite3_module *)0)->xRollback));
return SQLITE_OK;
}
@ -571,7 +572,7 @@ int sqlite3VtabRollback(sqlite3 *db){
** sqlite3.aVTrans array. Then clear the array itself.
*/
int sqlite3VtabCommit(sqlite3 *db){
callFinaliser(db, (int)(&((sqlite3_module *)0)->xCommit));
callFinaliser(db, (int)(intptr_t)(&((sqlite3_module *)0)->xCommit));
return SQLITE_OK;
}