From: drh Date: Wed, 15 Feb 2006 21:19:01 +0000 (+0000) Subject: Get the build working again. Fix for check-in (3093) (CVS 3100) X-Git-Tag: version-3.6.10~3067 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8c1513254bb3bde3af6f02680ed00659a3b9333;p=thirdparty%2Fsqlite.git Get the build working again. Fix for check-in (3093) (CVS 3100) FossilOrigin-Name: 4e6b74b290282fd10fae97df8dfa643a1b7ef0c6 --- diff --git a/manifest b/manifest index 85f189fe57..518fa0e073 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Mention\sthe\sNOT\sunary\soperator\sin\sthe\sdocumentation.\s(CVS\s3099) -D 2006-02-15T17:30:31 +C Get\sthe\sbuild\sworking\sagain.\s\sFix\sfor\scheck-in\s(3093)\s(CVS\s3100) +D 2006-02-15T21:19:01 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -70,7 +70,7 @@ F src/select.c 7d069e875d0eec05129c7e8b9c99422d7c9c6321 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 738f55ed75fb36731e764bfdb40756ac43b90b08 F src/sqlite.h.in bc78a247fd9f294b30a4c03894f93fcb1e166410 -F src/sqliteInt.h ba831d1f89d89892590f1cbe89058f5900b6d2f2 +F src/sqliteInt.h 531b714c17cb8c3da3eef51355fa37dacb2eaafd F src/table.c f64ec4fbfe333f8df925bc6ba494f55e05b0e75e F src/tclsqlite.c d9c26374b52cd47233ae0620d0a858a59b601f89 F src/test1.c ca8cb34747c53479e0748c11d1a10cc07d582bb8 @@ -353,7 +353,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 92be79debf328b9b2aac6509ed1dd94528306d3b -R 339b4750bd4ec95632107395a93b3c99 +P 3eca2d98683eb1b3b99604b07337347ad45e42f6 +R 165e3ef40d418955b1f1bee8e2350eea U drh -Z 89d7d9a09550d84cc5fc33393b1b8887 +Z 23f51b2c5a0e65830f55726c5d2c1f46 diff --git a/manifest.uuid b/manifest.uuid index 4a7a5c7a11..ab3f2563bb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3eca2d98683eb1b3b99604b07337347ad45e42f6 \ No newline at end of file +4e6b74b290282fd10fae97df8dfa643a1b7ef0c6 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 07ba7e9427..19fb27d4ef 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.482 2006/02/14 10:48:39 danielk1977 Exp $ +** @(#) $Id: sqliteInt.h,v 1.483 2006/02/15 21:19:01 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -284,8 +284,8 @@ extern int sqlite3_iLine; /* Line number for debug info */ #else -#define sqliteMalloc(x) sqlite3Malloc(x) -#define sqliteMallocRaw(x) sqlite3MallocRaw(x) +#define sqliteMalloc(x) sqlite3Malloc(x,1) +#define sqliteMallocRaw(x) sqlite3MallocRaw(x,1) #define sqliteRealloc(x,y) sqlite3Realloc(x,y) #define sqliteStrDup(x) sqlite3StrDup(x) #define sqliteStrNDup(x,y) sqlite3StrNDup(x,y)