Fix to sqlite3AllocMalloc() when it is a no-op macro. (CVS 2998)

FossilOrigin-Name: 8caa9f95b8a36e34510cf46d518bd63bd8fa0a32

diff --git a/manifest b/manifest
index 497286cfda451e8005b6ffab51fc4474ddc67f63..afb2381fc95f6940f41eeee42e627cb5ea31d983 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sname\svariables\s"operator"\sbecause\ssome\scompilers\sdo\snot\srealize\sthat\n"operator"\sis\snot\sa\sreserved\sword\sin\sANSI-C.\s\sTicket\s#1625.\s(CVS\s2997)
-D 2006-01-23T13:22:09
+C Fix\sto\ssqlite3AllocMalloc()\swhen\sit\sis\sa\sno-op\smacro.\s(CVS\s2998)
+D 2006-01-23T13:28:54
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -70,7 +70,7 @@ F src/select.c 11ad28afb33bb83b655074c87557d4686c67f92f
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 66b073375efbdee19045e7e0cd38b85f9aff71da
 F src/sqlite.h.in 492580f7e3ff71eb43193eb7bb98e2d549889ce3
-F src/sqliteInt.h fba26ce93a090aed928bcb1edcc58c0c1717c5b0
+F src/sqliteInt.h 35a3c3556abfca796cf44fea83c9f04385efcfb6
 F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316
 F src/tclsqlite.c 7764ab34df617b3d3cfd5f0fdf3444ed219c11d6
 F src/test1.c 846b3731af01ac90bad583f55e7969c8fb232172
@@ -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 ada5490f12795a8d13d0f42077c463709c677846
-R 4e45df66c826875844a3eaf91a8a5713
+P 1f42a338e2ee90f4c24a9eb19054c4b831dd661f
+R db1024d73945d88640ca69945bf51c00
 U drh
-Z 738eabaacc09b208edf518564b3dc665
+Z 098c9854808402d15135d501adfed3ef

diff --git a/manifest.uuid b/manifest.uuid
index 846ffa0a9cd6dab5a962f24d0022de37747ccf29..b679a77320b46aba1e62e03b1e04b74fc1813728 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f42a338e2ee90f4c24a9eb19054c4b831dd661f
\ No newline at end of file
+8caa9f95b8a36e34510cf46d518bd63bd8fa0a32
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0814b1418c9ebf47382c9f762b9c5a465fcaa602..759eb68f1b43fe876dc0c529656cb8b020d43ad1 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.477 2006/01/23 13:00:38 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.478 2006/01/23 13:28:54 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1759,9 +1759,9 @@ void sqlite3FailedMalloc(void);
   void sqlite3MallocAllow(void);
   int sqlite3TestMallocFail(void);
 #else
-  #define sqlite3TestMallocFail(void) 0
-  #define sqlite3MallocDisallow(void)
-  #define sqlite3MallocAllow(void)
+  #define sqlite3TestMallocFail() 0
+  #define sqlite3MallocDisallow()
+  #define sqlite3MallocAllow()
 #endif
 
 #ifdef SQLITE_SSE