From 414025db57cf533164a014bc40cf3b1802e0e679 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 31 Jan 2008 16:36:40 +0000 Subject: [PATCH] Fixes to API definition comments in sqlite.h.in. Updates to the build script - ticket #2874. (CVS 4762) FossilOrigin-Name: c23f51de61398b08a9f02cc65befcbfe506137c0 --- manifest | 14 +++++++------- manifest.uuid | 2 +- publish.sh | 7 ++----- src/sqlite.h.in | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index 139fae248f..c9e85b27c8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\svirtual\stable\sinterfaces\sare\snot\sinvoked\safter\sEOF\swhen\nthe\svirtual\stable\sappears\sin\san\souter\sjoin.\s\sTicket\s#2894.\s(CVS\s4761) -D 2008-01-31T15:53:45 +C Fixes\sto\sAPI\sdefinition\scomments\sin\ssqlite.h.in.\s\sUpdates\sto\sthe\nbuild\sscript\s-\sticket\s#2874.\s(CVS\s4762) +D 2008-01-31T16:36:40 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -71,7 +71,7 @@ F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1 F mkopcodeh.awk 513946ce4429bf2723aef0d640eb4d2493deb68e F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c -F publish.sh 1c0658c63d70f182a8f5e17cc28422f1b237f51d +F publish.sh 3ecffcfa9d4718b20fc8f1891ac529056636d37f F publish_osx.sh eca87df1e3d43d128d97d3261fd48b3d6877996e F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2 @@ -135,7 +135,7 @@ F src/random.c 02ef38b469237482f1ea14a78b2087cfbaec48bd F src/select.c 1a5d0aaf8f420b164eb775d3b1ba2bfb79597f65 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c ca06cb687c40a8bff6307b5fad41a0e86a0f8558 -F src/sqlite.h.in eeb3617be89c7004b8a2936d5a46e5138fe02ab9 +F src/sqlite.h.in 7d8596b5b4f8bfd4e171ba2fdfec1da1de71465e F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb F src/sqliteInt.h b006a4d887af1ce273683cc4874a506254068dbd F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e @@ -614,7 +614,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P b547e7ea75294997de4298e30af813f36dfa3b05 -R e903897809b4e69e604c108cab7fed0d +P face510bc14f440fc08dd5a354882ae05499bfa7 +R 2ecd31ad08cc305dd5a7c7f5c9076dd5 U drh -Z d25fc7ca7545d6d1f72f5f699e12446b +Z 40c301baed59af8803100e4b6c98d355 diff --git a/manifest.uuid b/manifest.uuid index d3ecab538b..ddf3c8a0b4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -face510bc14f440fc08dd5a354882ae05499bfa7 \ No newline at end of file +c23f51de61398b08a9f02cc65befcbfe506137c0 \ No newline at end of file diff --git a/publish.sh b/publish.sh index 0c06adfc46..138f3d901a 100644 --- a/publish.sh +++ b/publish.sh @@ -24,9 +24,6 @@ echo "VERSIONS: $VERS $VERSW" # make clean make sqlite3.c -make fts3amal.c -cat fts3amal.c >>sqlite3.c -cat fts3amal.c >>tclsqlite3.c CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0" echo '***** '"COMPILING sqlite3-$VERS.bin..." gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl @@ -41,7 +38,7 @@ mv sqlite3-$VERS.bin.gz doc make target_source cd tsrc echo '***** BUILDING preprocessed source archives' -rm fts* icu* +rm fts[12]* icu* rm -f ../doc/sqlite-source-$VERSW.zip zip ../doc/sqlite-source-$VERSW.zip * cd .. @@ -54,7 +51,7 @@ zip doc/sqlite-amalgamation-$VERSW.zip sqlite3.c sqlite3.h sqlite3ext.h # TCLDIR=/home/drh/tcltk/846/linux/846linux TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a -CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1" +CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1" echo '***** BUILDING shared libraries for linux' gcc $CFLAGS -shared tclsqlite3.c $TCLSTUBLIB -o tclsqlite3.so -lpthread strip tclsqlite3.so diff --git a/src/sqlite.h.in b/src/sqlite.h.in index f3d2d9d4ac..01448e933e 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.281 2008/01/31 14:43:24 drh Exp $ +** @(#) $Id: sqlite.h.in,v 1.282 2008/01/31 16:36:40 drh Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -3117,7 +3117,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** {F13803} The [sqlite3_column_blob(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a blob and then returns a +** [prepared statement] S into a blob and then returns a ** pointer to the converted value. ** ** {F13806} The [sqlite3_column_bytes(S,N)] interface returns the @@ -3133,40 +3133,40 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** {F13812} The [sqlite3_column_double(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a floating point value and +** [prepared statement] S into a floating point value and ** returns a copy of that value. ** ** {F13815} The [sqlite3_column_int(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a 32-bit signed integer and +** [prepared statement] S into a 32-bit signed integer and ** returns a copy of that integer. ** ** {F13818} The [sqlite3_column_int64(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a 64-bit signed integer and +** [prepared statement] S into a 64-bit signed integer and ** returns a copy of that integer. ** ** {F13821} The [sqlite3_column_text(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a zero-terminated UTF-8 +** [prepared statement] S into a zero-terminated UTF-8 ** string and returns a pointer to that string. ** ** {F13824} The [sqlite3_column_text16(S,N)] interface converts the ** Nth column in the current row of the result set for -** [prepared_statement] S into a zero-terminated 2-byte +** [prepared statement] S into a zero-terminated 2-byte ** aligned UTF-16 native byte order ** string and returns a pointer to that string. ** ** {F13827} The [sqlite3_column_type(S,N)] interface returns -** one of [SQLITE_NULL], [SQLITE_INTEGER], [SQLITE_REAL], +** one of [SQLITE_NULL], [SQLITE_INTEGER], [SQLITE_FLOAT], ** [SQLITE_TEXT], or [SQLITE_BLOB] as appropriate for ** the Nth column in the current row of the result set for -** [prepared_statement] S. +** [prepared statement] S. ** ** {F13830} The [sqlite3_column_value(S,N)] interface returns a ** pointer to the [sqlite3_value] object that for the ** Nth column in the current row of the result set for -** [prepared_statement] S. +** [prepared statement] S. */ const void *sqlite3_column_blob(sqlite3_stmt*, int iCol); int sqlite3_column_bytes(sqlite3_stmt*, int iCol); -- 2.47.3