For shell.c.in, define CHAR_BITS to 8 on platforms that do not have that

value set by default.  This fixes the build on older machines.

FossilOrigin-Name: 96610cc8251ad4ff8d7f0536f20f4572a996bfa8d24bec8a7925a333e507da1e

diff --git a/manifest b/manifest
index d47348ad6c13f601607d43d616fc3345bb44957e..fd29271867a00c068626db52a82c4c28a136b9df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sshell.c.in,\sand\sa\scompiler\swarning\sin\nsqlite3expert.c\swhich\sis\sa\sreal\serror,\sthough\salso\sharmless.
-D 2021-09-22T13:43:16.118
+C For\sshell.c.in,\sdefine\sCHAR_BITS\sto\s8\son\splatforms\sthat\sdo\snot\shave\sthat\nvalue\sset\sby\sdefault.\s\sThis\sfixes\sthe\sbuild\son\solder\smachines.
+D 2021-09-22T14:26:22.004
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -548,7 +548,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 030c3d07326708343208418c84da607752aebc13c92df929b7c68c7c08e7df54
-F src/shell.c.in 0d6ddfcc9b49e94d73406baa6121ab050482dbbab8eb5c77ca2cf6e8b9f6ab0b
+F src/shell.c.in 9df263dc0949698a8728ecc5bb826666ca8ced75201d5440a161b629455cd462
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@ -1925,7 +1925,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 3aa0bf3a098ee9a62c79f266f94e4d290056d0f3e91237944893d6bbb686861f
-R 02452d96ccf2df8f99cd8b1cd27c57d1
+P 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3
+R e64df9dd7f9e5649303080820ff5d5a9
 U drh
-Z 6efbe061fb0b8100b00437218a7d30c4
+Z ab5406251dac07f6df54e51480f60af8

diff --git a/manifest.uuid b/manifest.uuid
index 47a36a53bf6b45fb93dc1347e09d9495931463ae..7069dc86497afe28204512e507aa9c58c6566330 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3
\ No newline at end of file
+96610cc8251ad4ff8d7f0536f20f4572a996bfa8d24bec8a7925a333e507da1e
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index c996f580278dbb134d6b8ad8841530299f7f8a1c..c3544b22e964e55a20854d4f12a0f43902017f9c 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10619,6 +10619,9 @@ meta_command_exit:
 
 /* Line scan result and intermediate states (supporting scan resumption)
 */
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
 typedef enum {
   QSS_HasDark = 1<<CHAR_BIT, QSS_EndingSemi = 2<<CHAR_BIT,
   QSS_CharMask = (1<<CHAR_BIT)-1, QSS_ScanMask = 3<<CHAR_BIT,