diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
| commit | ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (patch) | |
| tree | acdb9a8816483652a9db1a47db71df5df43707c5 /ext/sqlite/libsqlite/src/sqlite.h.in | |
| parent | 10f5b47dc7c1cf2b9a00991629f43652710322d3 (diff) | |
| download | php-ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61.tar.gz | |
Imported Upstream version 5.1.1upstream/5.1.1
Diffstat (limited to 'ext/sqlite/libsqlite/src/sqlite.h.in')
| -rw-r--r-- | ext/sqlite/libsqlite/src/sqlite.h.in | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/ext/sqlite/libsqlite/src/sqlite.h.in b/ext/sqlite/libsqlite/src/sqlite.h.in index a620e987e..e92e41897 100644 --- a/ext/sqlite/libsqlite/src/sqlite.h.in +++ b/ext/sqlite/libsqlite/src/sqlite.h.in @@ -12,7 +12,7 @@ ** This header file defines the interface that the SQLite library ** presents to client programs. ** -** @(#) $Id: sqlite.h.in,v 1.6 2004/07/10 12:27:51 wez Exp $ +** @(#) $Id: sqlite.h.in,v 1.6.4.1 2005/09/07 15:11:33 iliaa Exp $ */ #ifndef _SQLITE_H_ #define _SQLITE_H_ @@ -28,7 +28,11 @@ extern "C" { /* ** The version of the SQLite library. */ -#define SQLITE_VERSION "--VERS--" +#ifdef SQLITE_VERSION +# undef SQLITE_VERSION +#else +# define SQLITE_VERSION "--VERS--" +#endif /* ** The version string is also compiled into the library so that a program @@ -479,10 +483,24 @@ int sqlite_function_type( int datatype /* The datatype for this function */ ); #define SQLITE_NUMERIC (-1) -#define SQLITE_TEXT (-2) +/* #define SQLITE_TEXT (-2) // See below */ #define SQLITE_ARGS (-3) /* +** SQLite version 3 defines SQLITE_TEXT differently. To allow both +** version 2 and version 3 to be included, undefine them both if a +** conflict is seen. Define SQLITE2_TEXT to be the version 2 value. +*/ +#ifdef SQLITE_TEXT +# undef SQLITE_TEXT +#else +# define SQLITE_TEXT (-2) +#endif +#define SQLITE2_TEXT (-2) + + + +/* ** The user function implementations call one of the following four routines ** in order to return their results. The first parameter to each of these ** routines is a copy of the first argument to xFunc() or xFinialize(). |