Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Get the amalgamation build working again. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
0078080de50d65721f6bb0120a94a243 |
User & Date: | drh 2013-01-12 15:13:53.625 |
Context
2013-01-12
| ||
15:50 | Many fts5 related fixes. check-in: e21b7b67b5 user: dan tags: trunk | |
15:13 | Get the amalgamation build working again. check-in: 0078080de5 user: drh tags: trunk | |
2013-01-09
| ||
18:15 | Merge matchinfo branch with trunk. check-in: dbbce4e438 user: dan tags: trunk | |
Changes
Changes to main.mk.
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | $(TOP)/src/complete.c \ $(TOP)/src/ctime.c \ $(TOP)/src/date.c \ $(TOP)/src/delete.c \ $(TOP)/src/expr.c \ $(TOP)/src/fault.c \ $(TOP)/src/fkey.c \ $(TOP)/src/func.c \ $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/kv.c \ | > > | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | $(TOP)/src/complete.c \ $(TOP)/src/ctime.c \ $(TOP)/src/date.c \ $(TOP)/src/delete.c \ $(TOP)/src/expr.c \ $(TOP)/src/fault.c \ $(TOP)/src/fkey.c \ $(TOP)/src/fts5.c \ $(TOP)/src/fts5func.c \ $(TOP)/src/func.c \ $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/kv.c \ |
︙ | ︙ |
Changes to src/lsmInt.h.
︙ | ︙ | |||
757 758 759 760 761 762 763 764 765 766 767 768 769 770 | void lsmSortedDumpStructure(lsm_db *pDb, Snapshot *, int, int, const char *); void lsmFsDumpBlocklists(lsm_db *); void lsmSortedExpandBtreePage(Page *pPg, int nOrig); void lsmPutU32(u8 *, u32); u32 lsmGetU32(u8 *); /* ** Functions from "lsm_varint.c". */ int lsmVarintPut32(u8 *, int); int lsmVarintGet32(u8 *, int *); int lsmVarintPut64(u8 *aData, i64 iVal); | > | 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 | void lsmSortedDumpStructure(lsm_db *pDb, Snapshot *, int, int, const char *); void lsmFsDumpBlocklists(lsm_db *); void lsmSortedExpandBtreePage(Page *pPg, int nOrig); void lsmPutU32(u8 *, u32); u32 lsmGetU32(u8 *); u64 lsmGetU64(u8 *); /* ** Functions from "lsm_varint.c". */ int lsmVarintPut32(u8 *, int); int lsmVarintGet32(u8 *, int *); int lsmVarintPut64(u8 *aData, i64 iVal); |
︙ | ︙ |
Changes to src/lsm_unix.c.
︙ | ︙ | |||
410 411 412 413 414 415 416 | } return LSM_OK; } /**************************************************************************** ** Memory allocation routines. */ | < | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 | } return LSM_OK; } /**************************************************************************** ** Memory allocation routines. */ #define BLOCK_HDR_SIZE ROUND8( sizeof(sqlite4_size_t) ) static void *lsmPosixOsMalloc(lsm_env *pEnv, int N){ unsigned char * m; N += BLOCK_HDR_SIZE; m = (unsigned char *)malloc(N); *((sqlite4_size_t*)m) = N; |
︙ | ︙ | |||
458 459 460 461 462 463 464 | } } static sqlite4_size_t lsmPosixOsMSize(lsm_env *pEnv, void *p){ unsigned char * m = (unsigned char *)p; return *((sqlite4_size_t*)(m-BLOCK_HDR_SIZE)); } | < | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | } } static sqlite4_size_t lsmPosixOsMSize(lsm_env *pEnv, void *p){ unsigned char * m = (unsigned char *)p; return *((sqlite4_size_t*)(m-BLOCK_HDR_SIZE)); } #undef BLOCK_HDR_SIZE #ifdef LSM_MUTEX_PTHREADS /************************************************************************* ** Mutex methods for pthreads based systems. If LSM_MUTEX_PTHREADS is ** missing then a no-op implementation of mutexes found in lsm_mutex.c |
︙ | ︙ |
Changes to src/mutex_noop.c.
︙ | ︙ | |||
33 34 35 36 37 38 39 | /* ** Stub routines for all mutex methods. ** ** This routines provide no mutual exclusion or error checking. */ static int noopMutexInit(void *p){ UNUSED_PARAMETER(p); return SQLITE4_OK; } static int noopMutexEnd(void *p){ UNUSED_PARAMETER(p); return SQLITE4_OK; } | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | /* ** Stub routines for all mutex methods. ** ** This routines provide no mutual exclusion or error checking. */ static int noopMutexInit(void *p){ UNUSED_PARAMETER(p); return SQLITE4_OK; } static int noopMutexEnd(void *p){ UNUSED_PARAMETER(p); return SQLITE4_OK; } static sqlite4_mutex *noopMutexAlloc(void *p, int id){ UNUSED_PARAMETER(p); UNUSED_PARAMETER(id); return (sqlite4_mutex*)8; } static void noopMutexFree(sqlite4_mutex *p){ UNUSED_PARAMETER(p); return; } static void noopMutexEnter(sqlite4_mutex *p){ UNUSED_PARAMETER(p); return; } static int noopMutexTry(sqlite4_mutex *p){ UNUSED_PARAMETER(p); |
︙ | ︙ |
Changes to src/rowset.c.
︙ | ︙ | |||
153 154 155 156 157 158 159 | } memset(p, 0, sizeof(RowSet)); p->isSorted = 1; } static u8 *rowsetAllocateChunk(RowSet *p, int nByte){ | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | } memset(p, 0, sizeof(RowSet)); p->isSorted = 1; } static u8 *rowsetAllocateChunk(RowSet *p, int nByte){ int rowChunkSize = ROUND8(sizeof(RowSetChunk)); u8 *pNew; /* New RowSetChunk */ int nAlloc; /* Bytes to request from malloc() */ nAlloc = rowChunkSize + nByte; pNew = (u8 *)sqlite4DbMallocRaw(p->db, nAlloc); return (pNew ? (pNew + rowChunkSize) : 0); } |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ #define SQLITE4_OMIT_ANALYZE 1 #define SQLITE4_OMIT_PROGRESS_CALLBACK 1 #define SQLITE4_OMIT_VIRTUALTABLE 1 #define SQLITE4_OMIT_XFER_OPT 1 /* ** These #defines should enable >2GB file support on POSIX if the ** underlying operating system supports it. If the OS lacks ** large file support, or if the OS is windows, these should be no-ops. ** ** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ #define SQLITE4_OMIT_ANALYZE 1 #define SQLITE4_OMIT_PROGRESS_CALLBACK 1 #define SQLITE4_OMIT_VIRTUALTABLE 1 #define SQLITE4_OMIT_XFER_OPT 1 #define SQLITE4_OMIT_LOCALTIME 1 /* ** These #defines should enable >2GB file support on POSIX if the ** underlying operating system supports it. If the OS lacks ** large file support, or if the OS is windows, these should be no-ops. ** ** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any |
︙ | ︙ |
Changes to tool/mksqlite4c.tcl.
︙ | ︙ | |||
156 157 158 159 160 161 162 163 164 165 166 167 168 169 | section_comment "Continuing where we left off in $tail" if {$linemacros} {puts $out "#line [expr {$ln+1}] \"$filename\""} } } elseif {![info exists seen_hdr($hdr)]} { set seen_hdr($hdr) 1 puts $out $line } else { puts $out "/* $line */" } } elseif {[regexp {^#ifdef __cplusplus} $line]} { puts $out "#if 0" } elseif {!$linemacros && [regexp {^#line} $line]} { # Skip #line directives. } elseif {$addstatic && ![regexp {^(static|typedef)} $line]} { | > | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | section_comment "Continuing where we left off in $tail" if {$linemacros} {puts $out "#line [expr {$ln+1}] \"$filename\""} } } elseif {![info exists seen_hdr($hdr)]} { set seen_hdr($hdr) 1 puts $out $line } else { regsub {\*/} $line {} line puts $out "/* $line */" } } elseif {[regexp {^#ifdef __cplusplus} $line]} { puts $out "#if 0" } elseif {!$linemacros && [regexp {^#line} $line]} { # Skip #line directives. } elseif {$addstatic && ![regexp {^(static|typedef)} $line]} { |
︙ | ︙ | |||
281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | pragma.c prepare.c select.c trigger.c update.c where.c parse.c tokenize.c complete.c main.c } { copy_file tsrc/$file } close $out | > > > | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | pragma.c prepare.c select.c trigger.c update.c where.c fts5.c fts5func.c parse.c tokenize.c complete.c main.c } { copy_file tsrc/$file } close $out |