Fix a bug in os.h. How did this slip by before now? (CVS 2986)

FossilOrigin-Name: 29725de474f9aec81cea0041d9ac2df932258d01

diff --git a/manifest b/manifest
index ec98798423c3206d58fdc0e3c1210afafd5ba307..9af1a7d543ff19c78e88d8fd7a7328e0cfb936b9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smore\sproblems\swith\smalloc()\sand\sIO\sfailures.\s(CVS\s2985)
-D 2006-01-21T12:08:54
+C Fix\sa\sbug\sin\sos.h.\s\sHow\sdid\sthis\sslip\sby\sbefore\snow?\s(CVS\s2986)
+D 2006-01-21T19:57:51
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -51,7 +51,7 @@ F src/legacy.c 0fd27db5e07a46853b9876baaa370b40e75a9b40
 F src/main.c 439168db0a830efd0b9e7325aff39adc5524a1b5
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 1d1a61cdf150e9f9520a3bc787c8465148ea2e78
-F src/os.h e4637eadcd5a9ca079029078d31751ae295fb05e
+F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
 F src/os_common.h 95b29ca6f3e6636cb33c9219b3f91a96fa7224b1
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 507653a98cbd096f836a977408e373640c7cdb8f
-R 4645653023c28a7e6aa62dcc72d6f189
-U danielk1977
-Z 226f4ae14f953612ee8b3482130c4818
+P 29281dea81c909b70b2d914d7061a6df8f388195
+R 2cfc41c8ea1cc80b34434b2ac4a057da
+U drh
+Z f6c5b51155ddd0b8f9133fdab5d2a2d3

diff --git a/manifest.uuid b/manifest.uuid
index 76addcdbf5be5ffc7a7e3461a82536fb0936d77b..dbad784bdda0d1caa6ed3689f251456a443e0836 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29281dea81c909b70b2d914d7061a6df8f388195
\ No newline at end of file
+29725de474f9aec81cea0041d9ac2df932258d01
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 485e4816d99c403dda36cc1e22efdc89c2fb3b2e..b294346b050933674cf5ca50c8f8d05dbe7f76ef 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -334,7 +334,7 @@ struct sqlite3OsVtbl {
 
   void (*xEnterMutex)(void);
   void (*xLeaveMutex)(void);
-  int (*xInMutex)(void);
+  int (*xInMutex)(int);
   ThreadData *(*xThreadSpecificData)(int);
 
   void *(*xMalloc)(int);