/ Check-in [47a46a9f]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Make the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 47a46a9fa4a96cdb96a20b6aec802661b1ee4598
User & Date: drh 2015-09-10 15:24:27
Context
2015-09-10
17:20
Create separate "path" and "root" columns in the json_each() and json_tree() virtual tables. "Root" is the 2nd parameter and is fixed. "Path" varies as json_tree() walks the hierarchy. check-in: 127cce3e user: drh tags: trunk
15:52
Merge latest changes from trunk. Including fts5_expr.c fixes. check-in: 716e7e74 user: dan tags: fts5-incompatible
15:24
Make the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION. check-in: 47a46a9f user: drh tags: trunk
15:22
Disable tests for json_each() and json_tree() on builds where virtual tables are not supported check-in: bb8ee3b1 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/sqlite3ext.h.

   281    281   ** This header file is also used by the loadext.c source file
   282    282   ** (part of the main SQLite library - not an extension) so that
   283    283   ** it can get access to the sqlite3_api_routines structure
   284    284   ** definition.  But the main library does not want to redefine
   285    285   ** the API.  So the redefinition macros are only valid if the
   286    286   ** SQLITE_CORE macros is undefined.
   287    287   */
   288         -#ifndef SQLITE_CORE
          288  +#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   289    289   #define sqlite3_aggregate_context      sqlite3_api->aggregate_context
   290    290   #ifndef SQLITE_OMIT_DEPRECATED
   291    291   #define sqlite3_aggregate_count        sqlite3_api->aggregate_count
   292    292   #endif
   293    293   #define sqlite3_bind_blob              sqlite3_api->bind_blob
   294    294   #define sqlite3_bind_double            sqlite3_api->bind_double
   295    295   #define sqlite3_bind_int               sqlite3_api->bind_int
................................................................................
   504    504   #define sqlite3_result_text64          sqlite3_api->result_text64
   505    505   #define sqlite3_strglob                sqlite3_api->strglob
   506    506   /* Version 3.8.11 and later */
   507    507   #define sqlite3_value_dup              sqlite3_api->value_dup
   508    508   #define sqlite3_value_free             sqlite3_api->value_free
   509    509   #define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
   510    510   #define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
   511         -#endif /* SQLITE_CORE */
          511  +#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
   512    512   
   513         -#ifndef SQLITE_CORE
          513  +#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   514    514     /* This case when the file really is being compiled as a loadable 
   515    515     ** extension */
   516    516   # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
   517    517   # define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
   518    518   # define SQLITE_EXTENSION_INIT3     \
   519    519       extern const sqlite3_api_routines *sqlite3_api;
   520    520   #else