Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix building with ENABLE_OTA and OMIT_LOAD_EXTENSION. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | ota-update |
| Files: | files | file ages | folders |
| SHA1: |
d6d21ff55228d3ffe6cdbb5755645b14 |
| User & Date: | dan 2015-02-23 20:09:50.667 |
Context
|
2015-03-05
| ||
| 13:43 | Fix a typo in sqlite3ota.h. (check-in: 04087dec4c user: dan tags: ota-update) | |
|
2015-02-23
| ||
| 20:09 | Fix building with ENABLE_OTA and OMIT_LOAD_EXTENSION. (check-in: d6d21ff552 user: dan tags: ota-update) | |
| 16:17 | Merge latest trunk changes with this branch. (check-in: e5ca79d2d3 user: dan tags: ota-update) | |
Changes
Changes to ext/ota/sqlite3ota.c.
| ︙ | ︙ | |||
3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 |
0, /* zName */
0, /* pAppData */
otaVfsOpen, /* xOpen */
otaVfsDelete, /* xDelete */
otaVfsAccess, /* xAccess */
otaVfsFullPathname, /* xFullPathname */
otaVfsDlOpen, /* xDlOpen */
otaVfsDlError, /* xDlError */
otaVfsDlSym, /* xDlSym */
otaVfsDlClose, /* xDlClose */
otaVfsRandomness, /* xRandomness */
otaVfsSleep, /* xSleep */
otaVfsCurrentTime, /* xCurrentTime */
otaVfsGetLastError, /* xGetLastError */
0, /* xCurrentTimeInt64 (version 2) */
0, 0, 0 /* Unimplemented version 3 methods */
| > > > > | 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 |
0, /* zName */
0, /* pAppData */
otaVfsOpen, /* xOpen */
otaVfsDelete, /* xDelete */
otaVfsAccess, /* xAccess */
otaVfsFullPathname, /* xFullPathname */
#ifndef SQLITE_OMIT_LOAD_EXTENSION
otaVfsDlOpen, /* xDlOpen */
otaVfsDlError, /* xDlError */
otaVfsDlSym, /* xDlSym */
otaVfsDlClose, /* xDlClose */
#else
0, 0, 0, 0,
#endif
otaVfsRandomness, /* xRandomness */
otaVfsSleep, /* xSleep */
otaVfsCurrentTime, /* xCurrentTime */
otaVfsGetLastError, /* xGetLastError */
0, /* xCurrentTimeInt64 (version 2) */
0, 0, 0 /* Unimplemented version 3 methods */
|
| ︙ | ︙ |
Changes to tool/mksqlite3c.tcl.
| ︙ | ︙ | |||
191 192 193 194 195 196 197 |
} elseif {!$linemacros && [regexp {^#line} $line]} {
# Skip #line directives.
} elseif {$addstatic && ![regexp {^(static|typedef)} $line]} {
regsub {^SQLITE_API } $line {} line
if {[regexp $declpattern $line all funcname]} {
# Add the SQLITE_PRIVATE or SQLITE_API keyword before functions.
# so that linkage can be modified at compile-time.
| | | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 |
} elseif {!$linemacros && [regexp {^#line} $line]} {
# Skip #line directives.
} elseif {$addstatic && ![regexp {^(static|typedef)} $line]} {
regsub {^SQLITE_API } $line {} line
if {[regexp $declpattern $line all funcname]} {
# Add the SQLITE_PRIVATE or SQLITE_API keyword before functions.
# so that linkage can be modified at compile-time.
if {[regexp {^sqlite3(_|ota_)} $funcname]} {
puts $out "SQLITE_API $line"
} else {
puts $out "SQLITE_PRIVATE $line"
}
} elseif {[regexp $varpattern $line all varname]} {
# Add the SQLITE_PRIVATE before variable declarations or
# definitions for internal use
|
| ︙ | ︙ |