diff options
| author | drh <drh@noemail.net> | 2004-09-06 17:34:12 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-09-06 17:34:12 +0000 |
| commit | 12057d54ef15da094ecbf877c31c5221bcce6b4a (patch) | |
| tree | 6fdf28f990737c9b100443e811180f3ffcf2f4ca /src | |
| parent | 9bb575fd72e8c92a39f35bfd75591b210908faad (diff) | |
| download | sqlite-12057d54ef15da094ecbf877c31c5221bcce6b4a.tar.gz sqlite-12057d54ef15da094ecbf877c31c5221bcce6b4a.zip | |
Fix more name collisions. Allow sqlite.h and sqlite3.h to both be included
in the same C/C++ source file. (CVS 1942)
FossilOrigin-Name: 23e5bed1c5062f0f639751f89873bf1a277547bd
Diffstat (limited to 'src')
| -rw-r--r-- | src/legacy.c | 4 | ||||
| -rw-r--r-- | src/sqlite.h.in | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/legacy.c b/src/legacy.c index 3a93cb420..a44af16ec 100644 --- a/src/legacy.c +++ b/src/legacy.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: legacy.c,v 1.6 2004/09/06 17:24:13 drh Exp $ +** $Id: legacy.c,v 1.7 2004/09/06 17:34:13 drh Exp $ */ #include "sqliteInt.h" @@ -34,7 +34,7 @@ int sqlite3_exec( sqlite3 *db, /* The database on which the SQL executes */ const char *zSql, /* The SQL to be executed */ - sqlite_callback xCallback, /* Invoke this callback routine */ + sqlite3_callback xCallback, /* Invoke this callback routine */ void *pArg, /* First argument to xCallback() */ char **pzErrMsg /* Write error messages here */ ){ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index cc506408b..ae4ce1978 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -12,10 +12,10 @@ ** This header file defines the interface that the SQLite library ** presents to client programs. ** -** @(#) $Id: sqlite.h.in,v 1.117 2004/09/06 17:24:13 drh Exp $ +** @(#) $Id: sqlite.h.in,v 1.118 2004/09/06 17:34:13 drh Exp $ */ -#ifndef _SQLITE_H_ -#define _SQLITE_H_ +#ifndef _SQLITE3_H_ +#define _SQLITE3_H_ #include <stdarg.h> /* Needed for the definition of va_list */ /* @@ -77,7 +77,7 @@ int sqlite3_close(sqlite3 *); /* ** The type for a callback function. */ -typedef int (*sqlite_callback)(void*,int,char**, char**); +typedef int (*sqlite3_callback)(void*,int,char**, char**); /* ** A function to executes one or more statements of SQL. @@ -120,9 +120,9 @@ typedef int (*sqlite_callback)(void*,int,char**, char**); ** and sqlite3_busy_timeout() functions below.) */ int sqlite3_exec( - sqlite3*, /* An open database */ + sqlite3*, /* An open database */ const char *sql, /* SQL to be executed */ - sqlite_callback, /* Callback function */ + sqlite3_callback, /* Callback function */ void *, /* 1st argument to callback function */ char **errmsg /* Error msg written here */ ); |