From e0237c00e181d1b662a56f7bfc9ddf279a94c0cb Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Jan 2023 18:32:14 +0000
Subject: [PATCH] Adjustements to the tool/warnings.sh script to account for
 compiler differences.

FossilOrigin-Name: 863c03bee117e81bcea8c3ae78bf125afc7750aa5bcb89e42ee66d9c8b6ddc29
---
 manifest         | 14 +++++++-------
 manifest.uuid    |  2 +-
 tool/warnings.sh |  8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 86115e2546..286c6009cf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sLIMIT\sclauses\smay\sbe\spassed\sthrough\sto\svirtual\stable\simplementations\seven\sif\sthe\sWHERE\sclause\suses\soperators\sthat\smay\sonly\sbe\soptimized\sby\svirtual,\snot\sbuilt-in,\stables\s(!=,\sfunctions,\sMATCH\setc.).
-D 2023-01-04T17:46:29.753
+C Adjustements\sto\sthe\stool/warnings.sh\sscript\sto\saccount\sfor\scompiler\ndifferences.
+D 2023-01-04T18:32:14.740
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2045,7 +2045,7 @@ F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
 F tool/vdbe-compress.tcl 1dcb7632e57cf57105248029e6e162fddaf6c0fccb3bb9e6215603752c5a2d4a
 F tool/vdbe_profile.tcl 3ac5a4a9449f4baf77059358ea050db3e34395ccf59c5464d29b91746d5b961e
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
-F tool/warnings.sh d58dc38367cc776550f90327e205d7946802d4004fb9f291fd8b81256bc1eedd
+F tool/warnings.sh ab651bb82586c43ff8b560beceac959735bf917b44c5e0f67ba3426e474f29f8
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
 F vsixtest/App.xaml.cpp 41158ee43269820136fa3bba00c0bd91b26cc38b650ee392aec2a8d823e54318
@@ -2068,8 +2068,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 869635fb81e0868dee80ce77653a2c1d2af41b3ffbf0a3f7b788ac99dc808887
-R 09b79d8dee52dbbaabe508a6440984a8
-U dan
-Z 3297969a556ae071bd8b9f4bfdf478f8
+P f38caab23bcef1df02618376de22d208a3333d023628cde310345505933329f1
+R 0651c8b5c0eb8ee41e81e5404c0397d0
+U drh
+Z 4a273995e784c5323bf444a97d5e6264
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d2c2a2a983..b6d04fdbcb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f38caab23bcef1df02618376de22d208a3333d023628cde310345505933329f1
\ No newline at end of file
+863c03bee117e81bcea8c3ae78bf125afc7750aa5bcb89e42ee66d9c8b6ddc29
\ No newline at end of file
diff --git a/tool/warnings.sh b/tool/warnings.sh
index a839d235b6..60d2b42100 100644
--- a/tool/warnings.sh
+++ b/tool/warnings.sh
@@ -11,7 +11,13 @@ if uname | grep -i openbsd ; then
 else
   # Use these for testing on Linux and Mac OSX:
   WARNING_OPTS="-Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long"
-  WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra"
+  gccvers=`gcc -v 2>&1 | grep '^gcc version'`
+  if test "$gccvers" '<' 'gcc version 6'
+  then
+    WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra"
+  else
+    WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra -Wimplicit-fallthrough=0"
+  fi
 fi
 
 rm -f sqlite3.c