Avoid redefining NDEBUG if the fuzzer is included in an amalagmated source file.

FossilOrigin-Name: f8ac826f95ae6b7b981e4765d2e65b6839d0eff9

diff --git a/manifest b/manifest
index b23524e5b753a0d6039c030dd03a04cdb69e31c2..42136690f4d07c1b016e1703731530d5ca21a800 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sthe\sfuzzer\sfrom\sever\sreturning\sa\sstring\slonger\sthan\s100\sbytes.
-D 2012-02-21T18:00:20.124
+C Avoid\sredefining\sNDEBUG\sif\sthe\sfuzzer\sis\sincluded\sin\san\samalagmated\ssource\sfile.
+D 2012-02-21T18:35:42.365
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -206,7 +206,7 @@ F src/test_config.c a036a69b550ebc477ab9ca2b37269201f888436e
 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c 6232d722a4ddb193035aa13a03796bf57d6c12fd
-F src/test_fuzzer.c e81b8984e9649499c45b080b60ebe4c1f6cff8d0
+F src/test_fuzzer.c 3703a190bd79a43e5f097d59c73ab38961d14872
 F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
 F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
 F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
@@ -990,7 +990,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 8b77d3953f082e6fa42e42fe903ea9eddf99dd91
-R eac7c759ba0fcf7d16f2f5a90574c01e
-U dan
-Z 5ce06301e86d5442c836392119f93673
+P 969095ca3067d60f4d3a0a4ad419541cb8b146db
+R 6f6307ffcfea232f8dcb8699efa50953
+U drh
+Z 053a16dcdcfeef74bca7f647480c806f

diff --git a/manifest.uuid b/manifest.uuid
index 13c72154f008d99ae14b3149a8c7f08e29d86125..85599c25d20437cbeaebe6bcc5c3e20154e78708 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-969095ca3067d60f4d3a0a4ad419541cb8b146db
\ No newline at end of file
+f8ac826f95ae6b7b981e4765d2e65b6839d0eff9
\ No newline at end of file

diff --git a/src/test_fuzzer.c b/src/test_fuzzer.c
index 66d0bd08d4a99d52e9461062ba4754a32836ea99..60d56ee1ea824a6384c46b7dc7c22ec84aa7ff8c 100644 (file)
--- a/src/test_fuzzer.c
+++ b/src/test_fuzzer.c
@@ -143,7 +143,7 @@
 */
 
 /* If SQLITE_DEBUG is not defined, disable assert statements. */
-#ifndef SQLITE_DEBUG
+#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
 # define NDEBUG
 #endif