Fix os_common.h so that the code builds without -DSQLITE_MEMDEBUG. (CVS 3000)

FossilOrigin-Name: 06d6540026568ca69410354ca8d85da78970c94b

diff --git a/manifest b/manifest
index add6fd9bce0134d6bdfe5eb72b55017bf3aad199..9359c5b2e851dbe23f6f3c8521428148258e2fd5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sautomatically\srollback\sat\sthe\sbtree\sor\spager\slevel\sif\sa\scommit\sfails.\s(CVS\s2999)
-D 2006-01-23T13:47:47
+C Fix\sos_common.h\sso\sthat\sthe\scode\sbuilds\swithout\s-DSQLITE_MEMDEBUG.\s(CVS\s3000)
+D 2006-01-23T14:05:18
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -52,7 +52,7 @@ F src/main.c 439168db0a830efd0b9e7325aff39adc5524a1b5
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 1d1a61cdf150e9f9520a3bc787c8465148ea2e78
 F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
-F src/os_common.h 95b29ca6f3e6636cb33c9219b3f91a96fa7224b1
+F src/os_common.h 061fba8511a656b118551424f64e366ad0d4cb3b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 38a55e51fb2c6f32c0ce86d274f5787f6c3668ed
@@ -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 8caa9f95b8a36e34510cf46d518bd63bd8fa0a32
-R ee42ba01834fee9f6799c64d4ff28b9b
-U danielk1977
-Z ad5bd029c9c2de6cb67cc213e02c05d2
+P 0f6329ef1fe0d5b225b6381fda1e8d800f65ea0f
+R ee5aceed6ef85c38491a964c1b25cb83
+U drh
+Z ac527cb7d8df8581edac16d40fd54c3f

diff --git a/manifest.uuid b/manifest.uuid
index d3193fceae911802de75043896424d1ca44b67f2..f9b0ec0a27a5f859b448b780ed8392a0e8800f0f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f6329ef1fe0d5b225b6381fda1e8d800f65ea0f
\ No newline at end of file
+06d6540026568ca69410354ca8d85da78970c94b
\ No newline at end of file

diff --git a/src/os_common.h b/src/os_common.h
index 1fa66a212d2470e46707e2ccebf3cdf1c5e3a987..b83a02b7c4608f0b4152df8c2df0224dedec88f1 100644 (file)
--- a/src/os_common.h
+++ b/src/os_common.h
@@ -183,9 +183,6 @@ void sqlite3GenericFree(void *p){
   assert(p);
   free(p);
 }
-#if 0   /* Never actually invoked */
-int sqlite3GenericAllocationSize(void *p){
-  assert(0);
-}
-#endif
+/* Never actually used, but needed for the linker */
+int sqlite3GenericAllocationSize(void *p){ return 0; }
 #endif