From: shess Date: Fri, 22 Sep 2006 23:38:21 +0000 (+0000) Subject: Fix a build problem around sqlite3_overload_function. Only affects X-Git-Tag: version-3.6.10~2732 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7409310ac3dc52197eb1ba5b950303642112095e;p=thirdparty%2Fsqlite.git Fix a build problem around sqlite3_overload_function. Only affects so/dll builds. (CVS 3435) FossilOrigin-Name: 791d70936b9c4fed57c95f61e3b4dfdd24221ee4 --- diff --git a/manifest b/manifest index 5a2716f3ff..126d0f987d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Implemented\sUPDATE\sfor\sfull-text\stables.\n\nWe\shandle\san\sUPDATE\sto\sa\srow\sby\sperforming\san\sUPDATE\son\sthe\scontent\stable\sand\sby\sbuilding\snew\sposition\slists\sfor\seach\sterm\swhich\sappears\sin\seither\sthe\sold\sor\snew\sversions\sof\sthe\srow.\s\sWe\swrite\sthese\sposition\slists\sall\sat\sonce;\sthis\sis\spresumably\smore\sefficient\sthan\sa\sdelete\sfollowed\sby\san\sinsert\s(which\swould\sfirst\swrite\sempty\sposition\slists,\sthen\snew\sposition\slists).\s(CVS\s3434) -D 2006-09-22T00:06:39 +C Fix\sa\sbuild\sproblem\saround\ssqlite3_overload_function.\s\sOnly\saffects\nso/dll\sbuilds.\s(CVS\s3435) +D 2006-09-22T23:38:21 F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -62,7 +62,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6 -F src/loadext.c 5ffbf47d9ed168507e38ab7d09b1827ea3c9ca6d +F src/loadext.c ab9b7fc502078a93f97161d28b4aac6ae2aad793 F src/main.c b9cf8dd198b0463b3de8954744e7cac6a1218126 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235 @@ -87,7 +87,7 @@ F src/select.c 0d4724930a1f34c747105ed1802fa4af0d8eb519 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 672326e8d90394218509f1820ab0835e7ed2bc06 F src/sqlite.h.in bf935004029631fd93d119bcf2f7259b9cb9ad5e -F src/sqlite3ext.h 11a046b3519c4b9b7709e6d6a95c3a36366f684a +F src/sqlite3ext.h 2c2156cc32a158e2b7bd9042d42accf94bff2e40 F src/sqliteInt.h c1d28fb13003c03fe7787d7ecc065d30530afc90 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06 F src/tclsqlite.c e029f739bed90071789fe81a226d53e97a80a4d8 @@ -399,7 +399,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 111ca616713dd89b5d1e114de29c83256731c482 -R a3012f8befb39c11285703f0d7d9c608 -U adamd -Z 86bfce1099fbc37e27d05b5a50b19016 +P 757fa22400b363212b4d5f648bdc9fcbd9a7f152 +R a5ed36e0e4e279ba62dac19559917c53 +U shess +Z db889ecb0c06c31c19fe6fec85c9eeaa diff --git a/manifest.uuid b/manifest.uuid index d116aeec8e..98476a88cd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -757fa22400b363212b4d5f648bdc9fcbd9a7f152 \ No newline at end of file +791d70936b9c4fed57c95f61e3b4dfdd24221ee4 \ No newline at end of file diff --git a/src/loadext.c b/src/loadext.c index 80cfc4cccd..dec0bb8dbf 100644 --- a/src/loadext.c +++ b/src/loadext.c @@ -214,6 +214,7 @@ const sqlite3_api_routines sqlite3_apis = { ** a library that is new enough to support that API. ************************************************************************* */ + sqlite3_overload_function, }; /* diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index c8e24cca1d..a44e6c717f 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -15,7 +15,7 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. ** -** @(#) $Id: sqlite3ext.h,v 1.6 2006/08/15 14:21:16 drh Exp $ +** @(#) $Id: sqlite3ext.h,v 1.7 2006/09/22 23:38:21 shess Exp $ */ #ifndef _SQLITE3EXT_H_ #define _SQLITE3EXT_H_ @@ -143,6 +143,7 @@ struct sqlite3_api_routines { const void * (*value_text16le)(sqlite3_value*); int (*value_type)(sqlite3_value*); char * (*vmprintf)(const char*,va_list); + int (*overload_function)(sqlite3*, const char *zFuncName, int nArg); }; /* @@ -272,6 +273,7 @@ struct sqlite3_api_routines { #define sqlite3_value_text16le sqlite3_api->value_text16le #define sqlite3_value_type sqlite3_api->value_type #define sqlite3_vmprintf sqlite3_api->vmprintf +#define sqlite3_overload_function sqlite3_api->overload_function #endif /* SQLITE_CORE */ #define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api;