Fix build errors in test_osinst (CVS 4998)

FossilOrigin-Name: f047399799798e693ef75c472144f30a0175b662

diff --git a/Makefile.in b/Makefile.in
index 0efacc31406a2d50207068904d3e34d087d7091d..f7bfb20c7e489ed17185607ebe1463dbbfbe910c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,6 +341,7 @@ TESTSRC = \
   $(TOP)/src/test_malloc.c \
   $(TOP)/src/test_md5.c \
   $(TOP)/src/test_onefile.c \
+  $(TOP)/src/test_osinst.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_tclvar.c \

diff --git a/manifest b/manifest
index 69eaa0297a21df54abf1037169b03d81f9fadf5e..0d918e314de75c47b773fe9e6336ac2fb6575049 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Modify\sspeedtest8.c\sso\sthat\sit\scan\suse\sthe\slogging\sfrom\stest_osinst.c\swhen\sHAVE_OSINST\sis\sdefined.\s(CVS\s4997)
-D 2008-04-12T16:03:37
+C Fix\sbuild\serrors\sin\stest_osinst\s(CVS\s4998)
+D 2008-04-13T23:13:40
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
+F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 7a41970464b74225915bcaf9d76efd01f26e08f9
@@ -164,7 +164,7 @@ F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_malloc.c c92a65e8f9b31bb2b332448d92d2016c000a963d
 F src/test_md5.c bca40b727c57462ddb415e57c5323445a1bb1a40
 F src/test_onefile.c 2fea6d22f13f5f286356c80c77ffd41f995f2b7a
-F src/test_osinst.c ff9bb856acc7ecaa21eb6920372594c3045a9a31
+F src/test_osinst.c caaf21cad43c2e642011b71fcddf16838b35fe00
 F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
 F src/test_server.c a6ece6c835e7eae835054124e09e947e422b1ac5
 F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
@@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 062bf5d44d53ae0ee2bf96eddcc8de09157aa789
-R acbe7f765f5e59e9c8330f514873e362
-U danielk1977
-Z 109ca7543e880caad3c790cf58ed5c5b
+P 7622d74ad6088de4d94cb727b60ac4a042c52016
+R eb34257922f461833483dfdf628f3806
+U mlcreech
+Z 95c5da5972df7da80d15bd9b995f9b6f

diff --git a/manifest.uuid b/manifest.uuid
index 8d82191d70c35919ad59ccd2c88e0fec9a5a6ada..96a49669656b0c8dc7aecf00771fdba277a8a6b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7622d74ad6088de4d94cb727b60ac4a042c52016
\ No newline at end of file
+f047399799798e693ef75c472144f30a0175b662
\ No newline at end of file

diff --git a/src/test_osinst.c b/src/test_osinst.c
index edcad2979ff4c62c47d86364e0b71d5583b55c59..b01354c323cd51024f6c61d0d02b12bfda829b6b 100644 (file)
--- a/src/test_osinst.c
+++ b/src/test_osinst.c
@@ -246,9 +246,9 @@ __inline__ unsigned long long int osinst_hwtime(void){
 #define OS_TIME_VFS(eEvent, Z, flags, A, B, Call) {      \
   InstVfs *pInstVfs = (InstVfs *)pVfs;   \
   int rc;                                \
-  sqlite3_int64 t = hwtime();                      \
+  sqlite3_int64 t = osinst_hwtime();     \
   rc = Call;                             \
-  t = hwtime() - t;                      \
+  t = osinst_hwtime() - t;               \
   pInstVfs->aTime[eEvent] += t;          \
   pInstVfs->aCount[eEvent] += 1;         \
   if( pInstVfs->xCall ){                 \