[asterisk-commits] file: branch file/astdb-sqlite3 r78694 - /team/file/astdb-sqlite3/main/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Aug 8 18:25:15 CDT 2007


Author: file
Date: Wed Aug  8 18:25:15 2007
New Revision: 78694

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78694
Log:
And so begins the 64-bit fixes for sqlite3.c

Modified:
    team/file/astdb-sqlite3/main/Makefile
    team/file/astdb-sqlite3/main/sqlite3.c

Modified: team/file/astdb-sqlite3/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/astdb-sqlite3/main/Makefile?view=diff&rev=78694&r1=78693&r2=78694
==============================================================================
--- team/file/astdb-sqlite3/main/Makefile (original)
+++ team/file/astdb-sqlite3/main/Makefile Wed Aug  8 18:25:15 2007
@@ -120,8 +120,6 @@
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
-sqlite3.o: ASTCFLAGS="$(PTHREAD_CFLAGS)"
-
 AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
 AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
 AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))

Modified: team/file/astdb-sqlite3/main/sqlite3.c
URL: http://svn.digium.com/view/asterisk/team/file/astdb-sqlite3/main/sqlite3.c?view=diff&rev=78694&r1=78693&r2=78694
==============================================================================
--- team/file/astdb-sqlite3/main/sqlite3.c (original)
+++ team/file/astdb-sqlite3/main/sqlite3.c Wed Aug  8 18:25:15 2007
@@ -30255,7 +30255,7 @@
   expandBlob(pVal);
   if( pVal->flags&MEM_Str ){
     sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
-    if( (int)(enc & SQLITE_UTF16_ALIGNED)!=(int)0 && (int)1==(int)(1&(int)pVal->z) ){
+    if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z[0]) ){
       assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 );
       if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){
         return 0;




More information about the asterisk-commits mailing list