Fossil SCM

Update the built-in SQLite to the 3.7.7 final with patches to fix compiler warnings associated with Fossil's use of SQLITE_THREADSAFE=0.

drh 2011-06-24 11:31 UTC trunk
Commit 745db63526e5bc2bd01e6995be02c273680eab3c
Parent 4722e1ab770c038…
2 files changed +4 -2 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+4 -2
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650650
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651651
 ** [sqlite_version()] and [sqlite_source_id()].
652652
 */
653653
 #define SQLITE_VERSION "3.7.7"
654654
 #define SQLITE_VERSION_NUMBER 3007007
655
-#define SQLITE_SOURCE_ID "2011-06-23 17:29:33 b61a76a53af04f731fe7617f7b6b4fb2aef6587b"
655
+#define SQLITE_SOURCE_ID "2011-06-24 11:29:51 9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8"
656656
657657
 /*
658658
 ** CAPI3REF: Run-Time Library Version Numbers
659659
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660660
 **
@@ -13544,11 +13544,13 @@
1354413544
 static int osLocaltime(time_t *t, struct tm *pTm){
1354513545
 int rc;
1354613546
 #if (!defined(HAVE_LOCALTIME_R) || !HAVE_LOCALTIME_R) \
1354713547
 && (!defined(HAVE_LOCALTIME_S) || !HAVE_LOCALTIME_S)
1354813548
 struct tm *pX;
13549
+#if SQLITE_THREADSAFE>0
1354913550
 sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
13551
+#endif
1355013552
 sqlite3_mutex_enter(mutex);
1355113553
 pX = localtime(t);
1355213554
 #ifndef SQLITE_OMIT_BUILTIN_TEST
1355313555
 if( sqlite3GlobalConfig.bLocaltimeFault ) pX = 0;
1355413556
 #endif
@@ -28136,11 +28138,11 @@
2813628138
 unixShmNode *p = pFd->pInode->pShmNode;
2813728139
 assert( unixMutexHeld() );
2813828140
 if( p && p->nRef==0 ){
2813928141
 int i;
2814028142
 assert( p->pInode==pFd->pInode );
28141
- if( p->mutex ) sqlite3_mutex_free(p->mutex);
28143
+ sqlite3_mutex_free(p->mutex);
2814228144
 for(i=0; i<p->nRegion; i++){
2814328145
 if( p->h>=0 ){
2814428146
 munmap(p->apRegion[i], p->szRegion);
2814528147
 }else{
2814628148
 sqlite3_free(p->apRegion[i]);
2814728149
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651 ** [sqlite_version()] and [sqlite_source_id()].
652 */
653 #define SQLITE_VERSION "3.7.7"
654 #define SQLITE_VERSION_NUMBER 3007007
655 #define SQLITE_SOURCE_ID "2011-06-23 17:29:33 b61a76a53af04f731fe7617f7b6b4fb2aef6587b"
656
657 /*
658 ** CAPI3REF: Run-Time Library Version Numbers
659 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660 **
@@ -13544,11 +13544,13 @@
13544 static int osLocaltime(time_t *t, struct tm *pTm){
13545 int rc;
13546 #if (!defined(HAVE_LOCALTIME_R) || !HAVE_LOCALTIME_R) \
13547 && (!defined(HAVE_LOCALTIME_S) || !HAVE_LOCALTIME_S)
13548 struct tm *pX;
 
13549 sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
 
13550 sqlite3_mutex_enter(mutex);
13551 pX = localtime(t);
13552 #ifndef SQLITE_OMIT_BUILTIN_TEST
13553 if( sqlite3GlobalConfig.bLocaltimeFault ) pX = 0;
13554 #endif
@@ -28136,11 +28138,11 @@
28136 unixShmNode *p = pFd->pInode->pShmNode;
28137 assert( unixMutexHeld() );
28138 if( p && p->nRef==0 ){
28139 int i;
28140 assert( p->pInode==pFd->pInode );
28141 if( p->mutex ) sqlite3_mutex_free(p->mutex);
28142 for(i=0; i<p->nRegion; i++){
28143 if( p->h>=0 ){
28144 munmap(p->apRegion[i], p->szRegion);
28145 }else{
28146 sqlite3_free(p->apRegion[i]);
28147
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651 ** [sqlite_version()] and [sqlite_source_id()].
652 */
653 #define SQLITE_VERSION "3.7.7"
654 #define SQLITE_VERSION_NUMBER 3007007
655 #define SQLITE_SOURCE_ID "2011-06-24 11:29:51 9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8"
656
657 /*
658 ** CAPI3REF: Run-Time Library Version Numbers
659 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660 **
@@ -13544,11 +13544,13 @@
13544 static int osLocaltime(time_t *t, struct tm *pTm){
13545 int rc;
13546 #if (!defined(HAVE_LOCALTIME_R) || !HAVE_LOCALTIME_R) \
13547 && (!defined(HAVE_LOCALTIME_S) || !HAVE_LOCALTIME_S)
13548 struct tm *pX;
13549 #if SQLITE_THREADSAFE>0
13550 sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
13551 #endif
13552 sqlite3_mutex_enter(mutex);
13553 pX = localtime(t);
13554 #ifndef SQLITE_OMIT_BUILTIN_TEST
13555 if( sqlite3GlobalConfig.bLocaltimeFault ) pX = 0;
13556 #endif
@@ -28136,11 +28138,11 @@
28138 unixShmNode *p = pFd->pInode->pShmNode;
28139 assert( unixMutexHeld() );
28140 if( p && p->nRef==0 ){
28141 int i;
28142 assert( p->pInode==pFd->pInode );
28143 sqlite3_mutex_free(p->mutex);
28144 for(i=0; i<p->nRegion; i++){
28145 if( p->h>=0 ){
28146 munmap(p->apRegion[i], p->szRegion);
28147 }else{
28148 sqlite3_free(p->apRegion[i]);
28149
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.7.7"
111111
 #define SQLITE_VERSION_NUMBER 3007007
112
-#define SQLITE_SOURCE_ID "2011-06-23 17:29:33 b61a76a53af04f731fe7617f7b6b4fb2aef6587b"
112
+#define SQLITE_SOURCE_ID "2011-06-24 11:29:51 9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.7.7"
111 #define SQLITE_VERSION_NUMBER 3007007
112 #define SQLITE_SOURCE_ID "2011-06-23 17:29:33 b61a76a53af04f731fe7617f7b6b4fb2aef6587b"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.7.7"
111 #define SQLITE_VERSION_NUMBER 3007007
112 #define SQLITE_SOURCE_ID "2011-06-24 11:29:51 9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button