Disable intrinsic functions for Windows using Clang, due to reports of

linkage errors.  This causes a 0.6% performance reduction.  We will want to
revisit this change in the future.

FossilOrigin-Name: 7fd560c6d2ff470b755ad118287a0a8825b3009e

diff --git a/manifest b/manifest
index a9e3f890183d791447bb7b7d32f39729aa800ddb..2715f1f973dbfd380568acd5a642f4a6485c9bf4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\scheck-in\s[0b3174e0b1364c]\sand\sreplace\sit\swith\sa\sbetter\sfix\sfor\s\\ticket\s[91e2e8ba6ff2e2]\s-\sa\sfix\sthat\sdoes\snot\scause\sthe\sproblem\sidentified\sby\s\nticket\s[7ffd1ca1d2ad4ec].\sAdd\snew\stest\scases\sfor\sboth\stickets.
-D 2017-01-16T18:10:17.967
+C Disable\sintrinsic\sfunctions\sfor\sWindows\susing\sClang,\sdue\sto\sreports\sof\nlinkage\serrors.\s\sThis\scauses\sa\s0.6%\sperformance\sreduction.\s\sWe\swill\swant\sto\nrevisit\sthis\schange\sin\sthe\sfuture.
+D 2017-01-17T00:10:58.166
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -394,7 +394,7 @@ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
 F src/sqlite.h.in e71655293c9bde26939496f3aac9d1821d2c07a2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
-F src/sqliteInt.h bec6274d8991528bc12d9a34d01fe84bdf6d00d9
+F src/sqliteInt.h ce3e07c720b0cebc8887ea86b3b128da0913c5d3
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@ -1546,8 +1546,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 97914266cb4ec63b0c9185ab139673139bd2f0ed 0613665274346917f5482f9210bf0c60a0fed7d9
-R d9bec5fa752ad661e71dee0a4ee8e911
-T +closed 0613665274346917f5482f9210bf0c60a0fed7d9
+P 9b64af7b5201a8700ae9e384b04714ca18df7449
+R 2a65551e28553413c063bc022e23faf5
 U drh
-Z 535f9cb18662b936eb37d1700bf0881b
+Z 6f331e0f247acb77a734fb284e31d3c4

diff --git a/manifest.uuid b/manifest.uuid
index 970b95dbebf57deb52bf440247e135afa01b38d1..30780fc11a0b8eaab490aa3abf9962c998554728 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9b64af7b5201a8700ae9e384b04714ca18df7449
\ No newline at end of file
+7fd560c6d2ff470b755ad118287a0a8825b3009e
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3215a7f865e5fc6f4f4e407a9580951da2cc45cb..d5ac957d22f47ae139ac9bdf6bf8fed4b16ba85e 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -111,7 +111,7 @@
 #endif
 
 /* What version of CLANG is being used.  0 means CLANG is not being used */
-#ifdef __clang__
+#if defined(__clang__) && !defined(_WIN32)
 # define CLANG_VERSION \
             (__clang_major__*1000000+__clang_minor__*1000+__clang_patchlevel__)
 #else