1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-24 09:53:10 +03:00

Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3

connection now *must* be called "sqlite3".  You cannot call it "sqlite".
This might break existing code. (CVS 1941)

FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
This commit is contained in:
drh
2004-09-06 17:24:11 +00:00
parent 873cdcb2ce
commit 9bb575fd72
31 changed files with 203 additions and 205 deletions

View File

@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
** $Id: func.c,v 1.82 2004/09/02 15:53:57 drh Exp $
** $Id: func.c,v 1.83 2004/09/06 17:24:13 drh Exp $
*/
#include <ctype.h>
#include <math.h>
@@ -268,7 +268,7 @@ static void last_insert_rowid(
int arg,
sqlite3_value **argv
){
sqlite *db = sqlite3_user_data(context);
sqlite3 *db = sqlite3_user_data(context);
sqlite3_result_int64(context, sqlite3_last_insert_rowid(db));
}
@@ -281,7 +281,7 @@ static void changes(
int arg,
sqlite3_value **argv
){
sqlite *db = sqlite3_user_data(context);
sqlite3 *db = sqlite3_user_data(context);
sqlite3_result_int(context, sqlite3_changes(db));
}
@@ -294,7 +294,7 @@ static void total_changes(
int arg,
sqlite3_value **argv
){
sqlite *db = sqlite3_user_data(context);
sqlite3 *db = sqlite3_user_data(context);
sqlite3_result_int(context, sqlite3_total_changes(db));
}
@@ -690,7 +690,7 @@ static void test_destructor(
){
char *zVal;
int len;
sqlite *db = sqlite3_user_data(pCtx);
sqlite3 *db = sqlite3_user_data(pCtx);
test_destructor_count_var++;
assert( nArg==1 );
@@ -917,7 +917,7 @@ static void minMaxFinalize(sqlite3_context *context){
** functions. This should be the only routine in this file with
** external linkage.
*/
void sqlite3RegisterBuiltinFunctions(sqlite *db){
void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
static struct {
char *zName;
signed char nArg;