Fix some #ifdefs so that builds work for all supported compile-time options.

FossilOrigin-Name: ca7d78f7818b4754fd04ea2b618dee1f01e11c6a5acb54951217c0d03df8e187

diff --cc manifest
index 5c040d1cdba1fe251ec3f3b1b7f82d7422aeca0c,c5c94653124d841fd6f07d5f410be17f2d82b500..85461e9276b4debe9ef507be6b749d3f977349db
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthe\s"nmakehlp.c"\sutility\sprogram\ssources\sassociated\swith\sthe\sTCL\nExtension\sArchitecture,\sobtained\sfrom\n[https://core.tcl-lang.org/sampleextension/file].\s\sPerhaps\sthis\snew\nversion\swill\ssit\sbetter\swith\ssalmonx's\sstatic\sanalyzer\n[forum:/forumpost/7f0beca9797ee23a|(ref1)],\n[forum:/forumpost/7d5c8b19231ad57f|(ref2)].
- D 2021-06-15T15:36:05.310
 -C Fix\san\sincorrect\sifdef\sin\sthe\sprevious\scheck-in.
 -D 2021-06-15T20:07:16.590
++C Fix\ssome\s#ifdefs\sso\sthat\sbuilds\swork\sfor\sall\ssupported\scompile-time\soptions.
++D 2021-06-15T20:10:25.201
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1918,7 -1918,7 +1918,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 272a15b9f418fb0b31a9808f7c42c20cf52318035ff98935d8e8519634357e8d
- R 097386e0f9bf33b02f625d198897ad8a
 -P d8cf407046f20b0398f19acd0dab6acb6c742911e21e1003cb5b194dd668d98e
++P 603b851d7d923d71543760b09a55d72dbbc185ac9c353c954c331c0454992c80 4b2bb46730393292364b2be7db4e73fc8f93cd5a141aaf04f20fe0119deb5ab3
+ R c793a2b6fd573c5020d76ea917fab815
++T +closed 4b2bb46730393292364b2be7db4e73fc8f93cd5a141aaf04f20fe0119deb5ab3
  U drh
- Z 29173b5fde864001fb27d15e020c7b34
 -Z dfa163831b09887fabddf76674335ea6
++Z 83f5ebc6b2c42f5bde61078e332a4e0b

diff --cc manifest.uuid
index 9402113a6f375d1d0712b013c40fbcbe9a63b222,b1e83968fb05c438c118c7e074353b04cf6f0384..57aa523bcb4561db4f3d1d60cf66fb4159ca8252
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 603b851d7d923d71543760b09a55d72dbbc185ac9c353c954c331c0454992c80
 -4b2bb46730393292364b2be7db4e73fc8f93cd5a141aaf04f20fe0119deb5ab3
++ca7d78f7818b4754fd04ea2b618dee1f01e11c6a5acb54951217c0d03df8e187