Get main.c to compile when HAVE_USLEEP is 0. (CVS 4245)
FossilOrigin-Name: b27f022fb924709f1c5e4642d5d59cab942e826d
diff --git a/manifest b/manifest
index 013fe39..e7053aa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\slocking-style\scode\sin\sos_unix.c.\sThe\supdates\sare\sas\syet\suntested.\s(CVS\s4244)
-D 2007-08-20T06:44:22
+C Get\smain.c\sto\scompile\swhen\sHAVE_USLEEP\sis\s0.\s(CVS\s4245)
+D 2007-08-20T11:12:41
F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -85,7 +85,7 @@
F src/legacy.c 6013a7cb7da1b72550b3d35d4fc598b3c3e5b8c1
F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
F src/loadext.c c0ccda3dbda109da087a8fd762deebe5fdf24a1d
-F src/main.c e4bfea7b893688b034cb5fd43a8f9d19a0c72c34
+F src/main.c 064bbb20e3614ed76410020cdba7f9c5c32eb040
F src/malloc.c 613c65f12ff0ee4edd017aa458209ab7a23cd7b1
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
F src/mem1.c 30bf8be3846f92fdf88c490c5e5378512383bcbe
@@ -529,7 +529,7 @@
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P cb24cda179c2b526c5ac48be75e372d2b9db808c
-R a091562a0f5306b5cbde266cfb56849b
-U danielk1977
-Z fa00070b2e6492f7113b7bd3fe1e6225
+P 41f2175b1ed7eccf271b687ee5c3ea262a0cd096
+R 3e86c1deeec6de8a6818d829abf2506d
+U drh
+Z e107c976a8aac7848166a53955d0d290
diff --git a/manifest.uuid b/manifest.uuid
index bfaf77d..f5ed8cc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41f2175b1ed7eccf271b687ee5c3ea262a0cd096
\ No newline at end of file
+b27f022fb924709f1c5e4642d5d59cab942e826d
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 9db08c4..a0a7cc6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: main.c,v 1.385 2007/08/18 10:59:20 danielk1977 Exp $
+** $Id: main.c,v 1.386 2007/08/20 11:12:41 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -323,11 +323,12 @@
sqlite3OsSleep(db->pVfs, delay);
return 1;
#else
+ sqlite3 *db = (sqlite3 *)ptr;
int timeout = ((sqlite3 *)ptr)->busyTimeout;
if( (count+1)*1000 > timeout ){
return 0;
}
- sqlite3OsSleep(1000);
+ sqlite3OsSleep(db->pVfs, 1000000);
return 1;
#endif
}