Merge additional linkage macro changes from the branch.

FossilOrigin-Name: 8b0eb22ee12b23421dcb8dbeb46909d813788a0b

diff --cc manifest
index 8c17c25796c8ad0568afea5f587035753a7cfce3,4e1dbf38c0e0b71788fce86b6b3bc15592deb74e..da1d23e9ba79f6f8c268328d6e3ba940ad4666d5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\srefinement\sto\sthe\scalling\sconvention\smacros.
- D 2016-07-29T01:49:36.961
 -C Merge\supdates\sfrom\strunk.
 -D 2016-07-29T01:47:18.951
++C Merge\sadditional\slinkage\smacro\schanges\sfrom\sthe\sbranch.
++D 2016-07-29T01:55:42.841
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@@ -1508,7 -1508,7 +1508,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c7d51934a4f30d096bb79fc509fc9dd0df5d89a4 bc8c9b55ddf5227dc6b2116486f4a19bf54fce2b
- R 554600d1ca55e9b4c82a4274bcc372e8
 -P 2daf20980d4cb9ed36372778ae1f3e595e503549 c7d51934a4f30d096bb79fc509fc9dd0df5d89a4
++P 45588de385d2a721b3e9f04beb6c7b789dd27d42 71ffa195f5a48280ee522d80ab82e8cdea636961
+ R 092b06ead5aa5690fab5536515621278
 -U mistachkin
 -Z 23d60fc77b6ae6b4289b40af8949150e
++T +closed 71ffa195f5a48280ee522d80ab82e8cdea636961
 +U drh
- Z 5b5bfebf7f52a37872ab26a1ec1320c2
++Z 3d26d07289768bac8aea9d48f7d64298

diff --cc manifest.uuid
index c200ec2ab61e9d45c00e1440ef1faa1198ca133a,ee46095cc0d1434f8505dbccd97c2f4e62ecfc43..e13e9140e9999e5e1b9d28f144dceb101dcdb817
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 45588de385d2a721b3e9f04beb6c7b789dd27d42
 -71ffa195f5a48280ee522d80ab82e8cdea636961
++8b0eb22ee12b23421dcb8dbeb46909d813788a0b