diff options
author | drh <drh@noemail.net> | 2015-07-24 22:21:01 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-07-24 22:21:01 +0000 |
commit | 87c44ef2f76229eeb5086e8e5ddb41a0fc6db150 (patch) | |
tree | 54ce2790f5a626dccb880bbb6210ec1ab9cdda54 /src/sqliteInt.h | |
parent | 244c8d7077ea25763bf2efce123da2f7d2d811cc (diff) | |
parent | 24fa5435ee5485f0779f14b58d6291174c9c3eb7 (diff) | |
download | sqlite-87c44ef2f76229eeb5086e8e5ddb41a0fc6db150.tar.gz sqlite-87c44ef2f76229eeb5086e8e5ddb41a0fc6db150.zip |
Merge test improvements and minor fixes from trunk.
FossilOrigin-Name: 0298a9a780695b666e7c683700d9f2f889d6f826
Diffstat (limited to 'src/sqliteInt.h')
-rw-r--r-- | src/sqliteInt.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 7d99d772f..aa6b63bff 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -189,10 +189,14 @@ ** 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 && !defined(_WIN32_WCE) -# include <intrin.h> -# pragma intrinsic(_byteswap_ushort) -# pragma intrinsic(_byteswap_ulong) +#if defined(_MSC_VER) && _MSC_VER>=1300 +# if !defined(_WIN32_WCE) +# include <intrin.h> +# pragma intrinsic(_byteswap_ushort) +# pragma intrinsic(_byteswap_ulong) +# else +# include <cmnintrin.h> +# endif #endif /* |