Fossil SCM
Port included SQLite to MorphOS using ixemul
Commit
b9998eb62537165e8b1429d08820f819d05e6b3f8f942f030e22e11cf45f27a1
Parent
f993a870a130f4b…
1 file changed
+6
-2
+6
-2
| --- extsrc/sqlite3.c | ||
| +++ extsrc/sqlite3.c | ||
| @@ -41286,11 +41286,11 @@ | ||
| 41286 | 41286 | ** still works when you do this, but concurrency is reduced since |
| 41287 | 41287 | ** only a single process can be reading the database at a time. |
| 41288 | 41288 | ** |
| 41289 | 41289 | ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off |
| 41290 | 41290 | */ |
| 41291 | -#if SQLITE_ENABLE_LOCKING_STYLE | |
| 41291 | +#if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__) | |
| 41292 | 41292 | |
| 41293 | 41293 | /* |
| 41294 | 41294 | ** Retry flock() calls that fail with EINTR |
| 41295 | 41295 | */ |
| 41296 | 41296 | #ifdef EINTR |
| @@ -44438,11 +44438,11 @@ | ||
| 44438 | 44438 | dotlockUnlock, /* xUnlock method */ |
| 44439 | 44439 | dotlockCheckReservedLock, /* xCheckReservedLock method */ |
| 44440 | 44440 | 0 /* xShmMap method */ |
| 44441 | 44441 | ) |
| 44442 | 44442 | |
| 44443 | -#if SQLITE_ENABLE_LOCKING_STYLE | |
| 44443 | +#if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__) | |
| 44444 | 44444 | IOMETHODS( |
| 44445 | 44445 | flockIoFinder, /* Finder function name */ |
| 44446 | 44446 | flockIoMethods, /* sqlite3_io_methods object name */ |
| 44447 | 44447 | 1, /* shared memory is disabled */ |
| 44448 | 44448 | flockClose, /* xClose method */ |
| @@ -47042,10 +47042,14 @@ | ||
| 47042 | 47042 | static sqlite3_vfs aVfs[] = { |
| 47043 | 47043 | #if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__) |
| 47044 | 47044 | UNIXVFS("unix", autolockIoFinder ), |
| 47045 | 47045 | #elif OS_VXWORKS |
| 47046 | 47046 | UNIXVFS("unix", vxworksIoFinder ), |
| 47047 | +#elif defined(__ixemul__) | |
| 47048 | + UNIXVFS("unix", flockIoFinder ), | |
| 47049 | + UNIXVFS("unix-flock", flockIoFinder ), | |
| 47050 | + UNIXVFS("unix-posix", flockIoFinder ), | |
| 47047 | 47051 | #else |
| 47048 | 47052 | UNIXVFS("unix", posixIoFinder ), |
| 47049 | 47053 | #endif |
| 47050 | 47054 | UNIXVFS("unix-none", nolockIoFinder ), |
| 47051 | 47055 | UNIXVFS("unix-dotfile", dotlockIoFinder ), |
| 47052 | 47056 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -41286,11 +41286,11 @@ | |
| 41286 | ** still works when you do this, but concurrency is reduced since |
| 41287 | ** only a single process can be reading the database at a time. |
| 41288 | ** |
| 41289 | ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off |
| 41290 | */ |
| 41291 | #if SQLITE_ENABLE_LOCKING_STYLE |
| 41292 | |
| 41293 | /* |
| 41294 | ** Retry flock() calls that fail with EINTR |
| 41295 | */ |
| 41296 | #ifdef EINTR |
| @@ -44438,11 +44438,11 @@ | |
| 44438 | dotlockUnlock, /* xUnlock method */ |
| 44439 | dotlockCheckReservedLock, /* xCheckReservedLock method */ |
| 44440 | 0 /* xShmMap method */ |
| 44441 | ) |
| 44442 | |
| 44443 | #if SQLITE_ENABLE_LOCKING_STYLE |
| 44444 | IOMETHODS( |
| 44445 | flockIoFinder, /* Finder function name */ |
| 44446 | flockIoMethods, /* sqlite3_io_methods object name */ |
| 44447 | 1, /* shared memory is disabled */ |
| 44448 | flockClose, /* xClose method */ |
| @@ -47042,10 +47042,14 @@ | |
| 47042 | static sqlite3_vfs aVfs[] = { |
| 47043 | #if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__) |
| 47044 | UNIXVFS("unix", autolockIoFinder ), |
| 47045 | #elif OS_VXWORKS |
| 47046 | UNIXVFS("unix", vxworksIoFinder ), |
| 47047 | #else |
| 47048 | UNIXVFS("unix", posixIoFinder ), |
| 47049 | #endif |
| 47050 | UNIXVFS("unix-none", nolockIoFinder ), |
| 47051 | UNIXVFS("unix-dotfile", dotlockIoFinder ), |
| 47052 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -41286,11 +41286,11 @@ | |
| 41286 | ** still works when you do this, but concurrency is reduced since |
| 41287 | ** only a single process can be reading the database at a time. |
| 41288 | ** |
| 41289 | ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off |
| 41290 | */ |
| 41291 | #if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__) |
| 41292 | |
| 41293 | /* |
| 41294 | ** Retry flock() calls that fail with EINTR |
| 41295 | */ |
| 41296 | #ifdef EINTR |
| @@ -44438,11 +44438,11 @@ | |
| 44438 | dotlockUnlock, /* xUnlock method */ |
| 44439 | dotlockCheckReservedLock, /* xCheckReservedLock method */ |
| 44440 | 0 /* xShmMap method */ |
| 44441 | ) |
| 44442 | |
| 44443 | #if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__) |
| 44444 | IOMETHODS( |
| 44445 | flockIoFinder, /* Finder function name */ |
| 44446 | flockIoMethods, /* sqlite3_io_methods object name */ |
| 44447 | 1, /* shared memory is disabled */ |
| 44448 | flockClose, /* xClose method */ |
| @@ -47042,10 +47042,14 @@ | |
| 47042 | static sqlite3_vfs aVfs[] = { |
| 47043 | #if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__) |
| 47044 | UNIXVFS("unix", autolockIoFinder ), |
| 47045 | #elif OS_VXWORKS |
| 47046 | UNIXVFS("unix", vxworksIoFinder ), |
| 47047 | #elif defined(__ixemul__) |
| 47048 | UNIXVFS("unix", flockIoFinder ), |
| 47049 | UNIXVFS("unix-flock", flockIoFinder ), |
| 47050 | UNIXVFS("unix-posix", flockIoFinder ), |
| 47051 | #else |
| 47052 | UNIXVFS("unix", posixIoFinder ), |
| 47053 | #endif |
| 47054 | UNIXVFS("unix-none", nolockIoFinder ), |
| 47055 | UNIXVFS("unix-dotfile", dotlockIoFinder ), |
| 47056 |