mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some codewarrior compilation problems. (CVS 5278)

Browse Source 
FossilOrigin-Name: e6ea8f87c102bd36ab0f2fbc8360fde49f4e3422
This commit is contained in:
danielk1977 2008-06-23 14:03:45 +00:00
parent 5dfecba1a4
commit 867d05a019
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\scompilation\sproblem\swith\sSQLITE_OMIT_VIRTUAL_TABLE\sis\sdefined.\s(CVS\s5277)
D 2008-06-23T13:57:22
C Fix\ssome\scodewarrior\scompilation\sproblems.\s(CVS\s5278)
D 2008-06-23T14:03:45
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -116,7 +116,7 @@ F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
F src/main.c 67a80507f4400333ccedfa2392496269e2f4ee0b
F src/malloc.c a3c5f9bf0073ee3f60c098a9d95ca0f1cb2c81c2
F src/malloc.c f52166df8abd7ff6990dbee1a0ce3534addc8617
F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
F src/mem1.c 159f10e280f2d9aea597cf938851e61652dd5c3d
F src/mem2.c 23f9538f35fbcd5665afe7056a56be0c7ed65aa7
@ -145,7 +145,7 @@ F src/select.c ea3e5e233cf16f4cb43f6ec35972683ae7bc03f3
F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec
F src/sqlite.h.in 6a80d00621a43271f01c77eb42bbf57e0f52051b
F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b
F src/sqliteInt.h 9cd8b86d9592f9ca521e6d1f003cc6ce8f673cfc
F src/sqliteInt.h 0129e546b43a06844d1d66fd9d9b3090676d0873
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
F src/status.c 6cb10377992505bd69f1ca1d75c1240a65f25a58
F src/table.c 1fa8f8113ac9cbc09ae4801c6d2a7f0af82c5822
@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 4215e3e5ae3376bd46e5e12eec14b8209c164830
R a7197bc3eb534ff9475cd8e3b42c9ea6
P 0421c09967a191fb62338eb8b1bd766be42f61cc
R 52bf66b5096b00041ec1d05176769f1b
U danielk1977
Z faf968a5b946d66e40b204ecac9020fa
Z 1b144410ae9704424d3e82154631562d

2
manifest.uuid
View File

@ -1 +1 @@
0421c09967a191fb62338eb8b1bd766be42f61cc
e6ea8f87c102bd36ab0f2fbc8360fde49f4e3422

6
src/malloc.c
View File

@ -12,7 +12,7 @@
**
** Memory allocation functions used throughout sqlite.
**
** $Id: malloc.c,v 1.24 2008/06/23 11:11:36 danielk1977 Exp $
** $Id: malloc.c,v 1.25 2008/06/23 14:03:45 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <stdarg.h>
@ -349,7 +349,7 @@ void sqlite3ScratchFree(void *p){
}
}else{
int i;
i = p - sqlite3Config.pScratch;
i = (u8 *)p - (u8 *)sqlite3Config.pScratch;
i /= sqlite3Config.szScratch;
assert( i>=0 && i<sqlite3Config.nScratch );
sqlite3_mutex_enter(mem0.mutex);
@ -428,7 +428,7 @@ void sqlite3PageFree(void *p){
** in the mem0.aPageFree[] array.
*/
int i;
i = p - sqlite3Config.pPage;
i = (u8 *)p - (u8 *)sqlite3Config.pPage;
i /= sqlite3Config.szPage;
assert( i>=0 && i<sqlite3Config.nPage );
sqlite3_mutex_enter(mem0.mutex);

4
src/sqliteInt.h
View File

@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
** @(#) $Id: sqliteInt.h,v 1.723 2008/06/23 09:50:52 danielk1977 Exp $
** @(#) $Id: sqliteInt.h,v 1.724 2008/06/23 14:03:45 danielk1977 Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@ -2214,7 +2214,7 @@ CollSeq *sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *);
void sqlite3EndBenignMalloc(void);
#else
#define sqlite3BeginBenignMalloc()
#define sqlite3FaultEndBenign()
#define sqlite3EndBenignMalloc()
#endif
#define IN_INDEX_ROWID 1