Fix a collision of the "B0" identifier name between the termios.h header

file and the SHA3 implementation in the shell.

FossilOrigin-Name: b9a58daca80a815e87e541cb5fff9bc8b93f131d223f322c5b83dd5a5f0c0312

diff --git a/manifest b/manifest
index 959575b3fc018833d2a958d47678380a1e0081c8..9a474a37329970f4f71280e39ad0c71e06e6e28f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sunused\s"sqlite3_stack_used"\sTCL\scommand\sfrom\sthe\stest\sharness.
-D 2017-05-03T19:36:50.091
+C Fix\sa\scollision\sof\sthe\s"B0"\sidentifier\sname\sbetween\sthe\stermios.h\sheader\nfile\sand\sthe\sSHA3\simplementation\sin\sthe\sshell.
+D 2017-05-04T11:13:50.417
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@ -403,7 +403,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 4f0adefaa5e9417459b07757e0f6060cac97930a86f0fba9797bab233ced66c0
-F src/shell.c 21b79c0e1b93f8e35fd7b4087d6ba438326c3d7e285d0dd51dfd741475f858a1
+F src/shell.c e5950029da103c5d378e71d548759459b9a7fc76177a71562c22082c705745ab
 F src/sqlite.h.in eeb1da70a61d52e1d58e5b55446b85bbac571699421d3cf857421c56214013ce
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
@@ -1578,7 +1578,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 05eba9e3a5f9bb2a40af1dacd885e1915fbcd20b9af4cf0eed79ac16dbeba31b
-R cc73eb460d9854ad23aa843f2d63b269
+P e24b73820cdca07eee87853fe6dd9f60d76e039eeb4aebef03654db3c7c94f14
+R e8b739e45c08ec8468647ac109d9456f
 U drh
-Z ade9e12e596bfcbd80a3bdd31cc0c7fe
+Z 82e99d9ee4b60fac8b8163f812301e67

diff --git a/manifest.uuid b/manifest.uuid
index de107869944f248afb04f61b35a0e13c0549446a..c0dd2c30e823ee29d0d29104e3a3300f7c215e7a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e24b73820cdca07eee87853fe6dd9f60d76e039eeb4aebef03654db3c7c94f14
\ No newline at end of file
+b9a58daca80a815e87e541cb5fff9bc8b93f131d223f322c5b83dd5a5f0c0312
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 15c88061c24b5cfa739e9476289bb236c825220d..582d6f3142747b15daaa33512da45516744c1cf8 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -744,6 +744,10 @@ struct SHA3Context {
   unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
 };
 
+/* Allow the following routine to use the B0 variable, which is also
+** a macro in the termios.h header file */
+#undef B0
+
 /*
 ** A single step of the Keccak mixing function for a 1600-bit state
 */