Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the os_unix.c source file so that it will build as part of an amalgamation on non-apple platforms. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | apple-osx |
| Files: | files | file ages | folders |
| SHA1: |
b2f7639c8faf962239d41bb3a151448f |
| User & Date: | drh 2011-10-31 19:34:47 |
Context
|
2011-10-31
| ||
| 19:59 | Fix a problem with sqlite3_backup_step() that resulted from a faulty merge. check-in: dacdec78 user: drh tags: apple-osx | |
| 19:34 | Fix the os_unix.c source file so that it will build as part of an amalgamation on non-apple platforms. check-in: b2f7639c user: drh tags: apple-osx | |
| 14:42 | Pull the latest trunk changes into the apple-osx branch. check-in: 4fa9ee79 user: drh tags: apple-osx | |
Changes
Changes to src/os_unix.c.
41
42
43
44
45
46
47
48
49
50
51
52
53
54
....
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
|
** * sqlite3_vfs method implementations. ** * Locking primitives for the proxy uber-locking-method. (MacOSX only) ** * Definitions of sqlite3_vfs objects for all locking methods ** plus implementations of sqlite3_os_init() and sqlite3_os_end(). */ #include "sqliteInt.h" #if SQLITE_OS_UNIX /* This file is used on unix only */ /* ** There are various methods for file locking used for concurrency ** control: ** ** 1. POSIX locking (the default), ** 2. No locking, ................................................................................ sqlite3demo_superunlock_corrupt(id, corruptDstFileLock); }else{ sqlite3demo_superunlock(pLock); } return rc; } #define SQLITE_FILE_HEADER_LEN 16 #include "btreeInt.h" /* Check for a conflicting lock. If one is found, print an this ** on standard output using the format string given and return 1. ** If there are no conflicting locks, return 0. */ static int unixIsLocked( pid_t pid, /* PID to test for lock owner */ int h, /* File descriptor to check */ |
>
>
>
<
|
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
....
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
|
** * sqlite3_vfs method implementations. ** * Locking primitives for the proxy uber-locking-method. (MacOSX only) ** * Definitions of sqlite3_vfs objects for all locking methods ** plus implementations of sqlite3_os_init() and sqlite3_os_end(). */ #include "sqliteInt.h" #if SQLITE_OS_UNIX /* This file is used on unix only */ #include "btreeInt.h" /* Use by Apple extensions only */ /* ** There are various methods for file locking used for concurrency ** control: ** ** 1. POSIX locking (the default), ** 2. No locking, ................................................................................ sqlite3demo_superunlock_corrupt(id, corruptDstFileLock); }else{ sqlite3demo_superunlock(pLock); } return rc; } #define SQLITE_FILE_HEADER_LEN 16 /* Check for a conflicting lock. If one is found, print an this ** on standard output using the format string given and return 1. ** If there are no conflicting locks, return 0. */ static int unixIsLocked( pid_t pid, /* PID to test for lock owner */ int h, /* File descriptor to check */ |