From: drh <drh@noemail.net>
Date: Mon, 13 Feb 2017 13:26:33 +0000 (+0000)
Subject: Fix typos in using the MSVC_VERSION macro.
X-Git-Tag: version-3.18.0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30a5831c45f5c51840fb8017bc1024e1bb058b53;p=thirdparty%2Fsqlite.git

Fix typos in using the MSVC_VERSION macro.

FossilOrigin-Name: f3b65926b1f439adb95e3bbce8e58785b8cf8427
---

diff --git a/manifest b/manifest
index b5ae3ca250..fbd6c3cbf1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\sduplication\s#define\sin\sFTS5
-D 2017-02-13T13:20:02.419
+C Fix\stypos\sin\susing\sthe\sMSVC_VERSION\smacro.
+D 2017-02-13T13:26:33.213
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -339,7 +339,7 @@ F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 F src/btree.c 9fe65ab418d99e80289f024016b5e5e74c3059dd
 F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
-F src/btreeInt.h 429bbfebae05ab3beb1c4508ba94c292036c660f
+F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
 F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@ -372,7 +372,7 @@ F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
 F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
-F src/mutex_w32.c 00bbf37d80fb763a8159b83cc3cbde0f91d37f7b
+F src/mutex_w32.c 3631e57d056062807ae2c92b79f3d1c05f04ecfe
 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
 F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
@@ -1555,7 +1555,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e464b919f76520b45bb58983c6702db59d820ee4
-R 8c09ada0ea1970f0e52c7f9e3e6704e9
+P c447441cff1884d6fe5f0a76d64b3e7d908584a1
+Q +25ebadd096ce98fd0f9fab809969d34b958794f6
+R 0d77a6b89e0c4cc810773e50b9f58357
 U drh
-Z 6a635e248bfa56654adaa33accae463e
+Z 66e01577a77088f99ecc22522d190a03
diff --git a/manifest.uuid b/manifest.uuid
index a7d1b63450..e47a2c37d8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c447441cff1884d6fe5f0a76d64b3e7d908584a1
\ No newline at end of file
+f3b65926b1f439adb95e3bbce8e58785b8cf8427
\ No newline at end of file
diff --git a/src/btreeInt.h b/src/btreeInt.h
index 0d79edd639..b01163c33f 100644
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -694,7 +694,7 @@ struct IntegrityCk {
 # define get2byteAligned(x)  (*(u16*)(x))
 #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4008000
 # define get2byteAligned(x)  __builtin_bswap16(*(u16*)(x))
-#elif SQLITE_BYTEORDER==1234 && MSCV_VERSION>=1300
+#elif SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
 # define get2byteAligned(x)  _byteswap_ushort(*(u16*)(x))
 #else
 # define get2byteAligned(x)  ((x)[0]<<8 | (x)[1])
diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index e0bdf9e43b..505c8fab7e 100644
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -87,7 +87,7 @@ void sqlite3MemoryBarrier(void){
   SQLITE_MEMORY_BARRIER;
 #elif defined(__GNUC__)
   __sync_synchronize();
-#elif MSCV_VERSION>=1300
+#elif MSVC_VERSION>=1300
   _ReadWriteBarrier();
 #elif defined(MemoryBarrier)
   MemoryBarrier();