Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | For the interop assembly, move the included extensions after the non-extension code. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
20c1de6d868e4c908752d605363efe0f |
User & Date: | mistachkin 2015-09-16 17:58:06.492 |
Context
2015-09-16
| ||
18:13 | Enhance test case for the SQLiteCommand.Reset method. check-in: d322dd9e02 user: mistachkin tags: trunk | |
17:58 | For the interop assembly, move the included extensions after the non-extension code. check-in: 20c1de6d86 user: mistachkin tags: trunk | |
17:57 | Update expected results for the 'tkt-71bedaca19-1.1' test to include the new 'IoErr_VNode' extended error code. check-in: ac28a75055 user: mistachkin tags: trunk | |
Changes
Changes to SQLite.Interop/src/win/interop.c.
︙ | ︙ | |||
22 23 24 25 26 27 28 | #endif #if defined(INTEROP_INCLUDE_ZIPVFS) #include "../ext/zipvfs.c" #include "../ext/algorithms.c" #endif | < < < < | < < | < < < < < < < < < < < < < < < < < | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #endif #if defined(INTEROP_INCLUDE_ZIPVFS) #include "../ext/zipvfs.c" #include "../ext/algorithms.c" #endif #if defined(INTEROP_EXTENSION_FUNCTIONS) #undef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE #include "../contrib/extension-functions.c" extern int RegisterExtensionFunctions(sqlite3 *db); #endif #if defined(SQLITE_OS_WIN) #if defined(INTEROP_CODEC) && !defined(INTEROP_INCLUDE_SEE) #include "crypt.c" |
︙ | ︙ | |||
499 500 501 502 503 504 505 506 507 508 509 510 511 512 | if (plen) *plen = (pztail && *pztail) ? wcslen((wchar_t *)*pztail) * sizeof(wchar_t) : 0; return n; } #if defined(INTEROP_VIRTUAL_TABLE) && SQLITE_VERSION_NUMBER >= 3004001 SQLITE_API void *WINAPI sqlite3_create_disposable_module_interop( sqlite3 *db, const char *zName, sqlite3_module *pModule, int iVersion, int (*xCreate)(sqlite3*, void *, int, const char *const*, sqlite3_vtab **, char**), int (*xConnect)(sqlite3*, void *, int, const char *const*, sqlite3_vtab **, char**), | > > > > > > > > > > > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | if (plen) *plen = (pztail && *pztail) ? wcslen((wchar_t *)*pztail) * sizeof(wchar_t) : 0; return n; } #if defined(INTEROP_VIRTUAL_TABLE) && SQLITE_VERSION_NUMBER >= 3004001 #ifdef _WIN32 __declspec(dllexport) #endif void *sqlite3_create_disposable_module( sqlite3 *db, const char *zName, const sqlite3_module *p, void *pClientData, void(*xDestroy)(void*) ); /* defined in "src/ext/vtshim.c" (included below) */ SQLITE_API void *WINAPI sqlite3_create_disposable_module_interop( sqlite3 *db, const char *zName, sqlite3_module *pModule, int iVersion, int (*xCreate)(sqlite3*, void *, int, const char *const*, sqlite3_vtab **, char**), int (*xConnect)(sqlite3*, void *, int, const char *const*, sqlite3_vtab **, char**), |
︙ | ︙ | |||
1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 | break; } sqlite3_mutex_leave(db->mutex); return ret; } #endif /* SQLITE_OS_WIN */ /*****************************************************************************/ /* ** The INTEROP_TEST_EXTENSION block must be at the end of this source file ** because it includes the "sqlite3ext.h" file, which defines the sqlite3 ** public API function names to be macros and that would cause the code | > > > > > > > > > > > > > > > > > > > > > > > > > > | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 | break; } sqlite3_mutex_leave(db->mutex); return ret; } #endif /* SQLITE_OS_WIN */ /*****************************************************************************/ #if defined(INTEROP_VIRTUAL_TABLE) && SQLITE_VERSION_NUMBER >= 3004001 #include "../ext/vtshim.c" #endif #if defined(INTEROP_FTS5_EXTENSION) #include "../ext/fts5.c" #endif #if defined(INTEROP_JSON1_EXTENSION) #include "../ext/json1.c" #endif #if defined(INTEROP_PERCENTILE_EXTENSION) #include "../ext/percentile.c" #endif #if defined(INTEROP_REGEXP_EXTENSION) #include "../ext/regexp.c" #endif #if defined(INTEROP_TOTYPE_EXTENSION) #include "../ext/totype.c" #endif /*****************************************************************************/ /* ** The INTEROP_TEST_EXTENSION block must be at the end of this source file ** because it includes the "sqlite3ext.h" file, which defines the sqlite3 ** public API function names to be macros and that would cause the code |
︙ | ︙ |