From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 10 Aug 2009 04:37:49 +0000 (+0000)
Subject: Exclude a static function in test1.c from the build when OMIT_DEPRECATED is defined... 
X-Git-Tag: cvs-to-fossil-cutover~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55128825606f70551b9de4fc362c50897d69e85;p=thirdparty%2Fsqlite.git

Exclude a static function in test1.c from the build when OMIT_DEPRECATED is defined. This avoids a compiler warning that occurs with some compilers. (CVS 6967)

FossilOrigin-Name: ace499506e3c7a315f66928d8a98de255491b2b9
---

diff --git a/manifest b/manifest
index b06107e65d..174f2b4073 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\smallocI.test\sto\sclose\sa\sdatabase\sconnection\sthat\swas\sbeing\sleft\sopen.\s(CVS\s6966)
-D 2009-08-10T04:26:39
+C Exclude\sa\sstatic\sfunction\sin\stest1.c\sfrom\sthe\sbuild\swhen\sOMIT_DEPRECATED\sis\sdefined.\sThis\savoids\sa\scompiler\swarning\sthat\soccurs\swith\ssome\scompilers.\s(CVS\s6967)
+D 2009-08-10T04:37:50
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -168,7 +168,7 @@ F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
 F src/tclsqlite.c e18e5013dc6bca9f25e6022fbe17ba3ccb821f95
-F src/test1.c c8f9358879876660b721369f576bf6e4ac5b9210
+F src/test1.c 0e882812c94cf35fce30fc25fbf952a33a86d70b
 F src/test2.c 0de743ec8890ca4f09e0bce5d6d5a681f5957fec
 F src/test3.c 2445c2beb5e7a0c91fd8136dc1339ec369a24898
 F src/test4.c f79ab52d27ff49b784b631a42e2ccd52cfd5c84c
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P ee034cfc71425745dda8d5fee58ae95f937c86cd
-R fa37ac4298673916a7a1170de67d4d43
+P 4f0096d7ef43f4b9f32c4d78b3dfe34271f2120a
+R 8572262da1e41d66412339ca650c3aa4
 U danielk1977
-Z 2c4f2c486224fc3bb2bc72e83ba5fd66
+Z 11f9e6a9da7f8d6c44a6b0c52b76d145
diff --git a/manifest.uuid b/manifest.uuid
index ba43b319a4..2c9ea7ea03 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f0096d7ef43f4b9f32c4d78b3dfe34271f2120a
\ No newline at end of file
+ace499506e3c7a315f66928d8a98de255491b2b9
\ No newline at end of file
diff --git a/src/test1.c b/src/test1.c
index 72eeb1ae91..5976cab1ac 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.353 2009/05/03 20:23:54 drh Exp $
+** $Id: test1.c,v 1.354 2009/08/10 04:37:50 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -1099,6 +1099,7 @@ static void t1CountFinalize(sqlite3_context *context){
   }
 }
 
+#ifndef SQLITE_OMIT_DEPRECATED
 static void legacyCountStep(
   sqlite3_context *context,
   int argc,
@@ -1107,7 +1108,6 @@ static void legacyCountStep(
   /* no-op */
 }
 
-#ifndef SQLITE_OMIT_DEPRECATED
 static void legacyCountFinalize(sqlite3_context *context){
   sqlite3_result_int(context, sqlite3_aggregate_count(context));
 }