diff options
| author | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
| commit | 244c8d7077ea25763bf2efce123da2f7d2d811cc (patch) | |
| tree | 76ee15618f861fe989e7b16dfaca84bb121f35a3 /src/sqliteInt.h | |
| parent | 38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (diff) | |
| parent | cfb8f8d6a9073040e90f0bf502f4b108d7917433 (diff) | |
| download | sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.tar.gz sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.zip | |
Merge all changes in the latest 3.8.11 beta into the sessions branch.
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.
FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 6edb885c1..7d99d772f 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -189,7 +189,7 @@ ** Make sure that the compiler intrinsics we desire are enabled when ** compiling with an appropriate version of MSVC. */ -#if defined(_MSC_VER) && _MSC_VER>=1300 +#if defined(_MSC_VER) && _MSC_VER>=1300 && !defined(_WIN32_WCE) # include <intrin.h> # pragma intrinsic(_byteswap_ushort) # pragma intrinsic(_byteswap_ulong) @@ -754,7 +754,9 @@ extern const int sqlite3one; # if defined(__linux__) \ || defined(_WIN32) \ || (defined(__APPLE__) && defined(__MACH__)) \ - || defined(__sun) + || defined(__sun) \ + || defined(__FreeBSD__) \ + || defined(__DragonFly__) # define SQLITE_MAX_MMAP_SIZE 0x7fff0000 /* 2147418112 */ # else # define SQLITE_MAX_MMAP_SIZE 0 |