Fix testfixture linking problem by marking unix-only symbol as such. (CVS 5944)

FossilOrigin-Name: 2ca8b82247277baf3b81b5111988305ad5f67701

diff --git a/manifest b/manifest
index 31048c2eaea03cca71db0ff8ed9e52694ef8042d..d080675a2c50606429cc7a58ef33848ff346ed93 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Factor\sout\sand\ssimplify\sthe\scanonical\spathname\slogic\sin\sthe\sVxWorks\sOS\ninterface.\s(CVS\s5943)
-D 2008-11-21T22:21:50
+C Fix\stestfixture\slinking\sproblem\sby\smarking\sunix-only\ssymbol\sas\ssuch.\s(CVS\s5944)
+D 2008-11-21T23:35:03
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0aa7bbe3be6acc4045706e3bb3fd0b8f38f4a3b5
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -159,7 +159,7 @@ F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
 F src/tclsqlite.c 96049bd454f1547abff0a57c45f0dfa57701e076
-F src/test1.c d915e5cf26c5ba2a9778ad5b26cbaf97412b8b74
+F src/test1.c e604b8647aaf1b2cb16ff927e1f4d825f8589e8e
 F src/test2.c 897528183edf2839c2a3c991d415905db56f1240
 F src/test3.c 88a246b56b824275300e6c899634fbac1dc94b14
 F src/test4.c f79ab52d27ff49b784b631a42e2ccd52cfd5c84c
@@ -661,7 +661,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 30a0132a83ce95d45f106fce1439e7509fdc64d1
-R 727967b3ac4d95720606a532009fdaaa
-U drh
-Z f50fe49f2b42838f590774808a79b5a4
+P adb0aafaa6b1ea06541f653a2559f099fb1b2795
+R 3c7efc80db23daed6cb5b409b6c656fc
+U pweilbacher
+Z 758b2b6f231b1dbf0e5a753e423bfba4

diff --git a/manifest.uuid b/manifest.uuid
index 0435fa157f2ca13a2350f417c979f62089206f87..5f5a40b9d56083458300f443559445e27d42d6a9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-adb0aafaa6b1ea06541f653a2559f099fb1b2795
\ No newline at end of file
+2ca8b82247277baf3b81b5111988305ad5f67701
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 62aa0e11b7c0b2bd145e6e3c6b2549f91c2bc10c..e555a3392cff2ef462c1c39ea20d49eaa7819120 100644 (file)
--- 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.330 2008/11/21 00:10:35 aswift Exp $
+** $Id: test1.c,v 1.331 2008/11/21 23:35:03 pweilbacher Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -4718,7 +4718,9 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   extern int sqlite3_open_file_count;
   extern int sqlite3_sort_count;
   extern int sqlite3_current_time;
+#if SQLITE_OS_UNIX
   extern int sqlite3_hostid_num;
+#endif
   extern int sqlite3_max_blobsize;
   extern int sqlite3BtreeSharedCacheReport(void*,
                                           Tcl_Interp*,int,Tcl_Obj*CONST*);
@@ -4936,8 +4938,10 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
       (char*)&sqlite3_open_file_count, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_current_time", 
       (char*)&sqlite3_current_time, TCL_LINK_INT);
+#if SQLITE_OS_UNIX
   Tcl_LinkVar(interp, "sqlite_hostid_num", 
       (char*)&sqlite3_hostid_num, TCL_LINK_INT);
+#endif
   Tcl_LinkVar(interp, "sqlite3_xferopt_count",
       (char*)&sqlite3_xferopt_count, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite3_pager_readdb_count",