Fossil SCM

merge trunk

jan.nijtmans 2014-10-17 11:51 winsymlink merge
Commit 115efe1692a613d44fed36cbca471c6f6daf984e
Parent 55f1c036f048d58…
2 files changed +10 -5 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+10 -5
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -231,11 +231,11 @@
231231
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
232232
 ** [sqlite_version()] and [sqlite_source_id()].
233233
 */
234234
 #define SQLITE_VERSION "3.8.7"
235235
 #define SQLITE_VERSION_NUMBER 3008007
236
-#define SQLITE_SOURCE_ID "2014-10-15 15:28:27 3c1e70f4d55bc009ed9ed4cf6d756d7061985851"
236
+#define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
237237
238238
 /*
239239
 ** CAPI3REF: Run-Time Library Version Numbers
240240
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
241241
 **
@@ -22091,11 +22091,11 @@
2209122091
 #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */
2209222092
 /******************************** End Unix Pthreads *************************/
2209322093
2209422094
2209522095
 /********************************* Win32 Threads ****************************/
22096
-#if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
22096
+#if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
2209722097
2209822098
 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */
2209922099
 #include <process.h>
2210022100
2210122101
 /* A running thread */
@@ -22184,11 +22184,11 @@
2218422184
 if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
2218522185
 sqlite3_free(p);
2218622186
 return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;
2218722187
 }
2218822188
22189
-#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINRT */
22189
+#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */
2219022190
 /******************************** End Win32 Threads *************************/
2219122191
2219222192
2219322193
 /********************************* Single-Threaded **************************/
2219422194
 #ifndef SQLITE_THREADS_IMPLEMENTED
@@ -33487,11 +33487,15 @@
3348733487
 #endif
3348833488
3348933489
 #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
3349033490
 DWORD))aSyscall[63].pCurrent)
3349133491
33492
+#if !SQLITE_OS_WINCE
3349233493
 { "WaitForSingleObjectEx", (SYSCALL)WaitForSingleObjectEx, 0 },
33494
+#else
33495
+ { "WaitForSingleObjectEx", (SYSCALL)0, 0 },
33496
+#endif
3349333497
3349433498
 #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
3349533499
 BOOL))aSyscall[64].pCurrent)
3349633500
3349733501
 #if SQLITE_OS_WINRT
@@ -33830,11 +33834,12 @@
3383033834
 #else
3383133835
 osSleep(milliseconds);
3383233836
 #endif
3383333837
 }
3383433838
33835
-#if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
33839
+#if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
33840
+ SQLITE_THREADSAFE>0
3383633841
 SQLITE_PRIVATE DWORD sqlite3Win32Wait(HANDLE hObject){
3383733842
 DWORD rc;
3383833843
 while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
3383933844
 TRUE))==WAIT_IO_COMPLETION ){}
3384033845
 return rc;
@@ -78222,11 +78227,11 @@
7822278227
 if( rc==SQLITE_OK ){
7822378228
 #if SQLITE_MAX_WORKER_THREADS
7822478229
 assert( pSorter->bUseThreads==0 || pSorter->nTask>1 );
7822578230
 if( pSorter->bUseThreads ){
7822678231
 int iTask;
78227
- PmaReader *pReadr;
78232
+ PmaReader *pReadr = 0;
7822878233
 SortSubtask *pLast = &pSorter->aTask[pSorter->nTask-1];
7822978234
 rc = vdbeSortAllocUnpacked(pLast);
7823078235
 if( rc==SQLITE_OK ){
7823178236
 pReadr = (PmaReader*)sqlite3DbMallocZero(db, sizeof(PmaReader));
7823278237
 pSorter->pReader = pReadr;
7823378238
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -231,11 +231,11 @@
231 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
232 ** [sqlite_version()] and [sqlite_source_id()].
233 */
234 #define SQLITE_VERSION "3.8.7"
235 #define SQLITE_VERSION_NUMBER 3008007
236 #define SQLITE_SOURCE_ID "2014-10-15 15:28:27 3c1e70f4d55bc009ed9ed4cf6d756d7061985851"
237
238 /*
239 ** CAPI3REF: Run-Time Library Version Numbers
240 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
241 **
@@ -22091,11 +22091,11 @@
22091 #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */
22092 /******************************** End Unix Pthreads *************************/
22093
22094
22095 /********************************* Win32 Threads ****************************/
22096 #if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
22097
22098 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */
22099 #include <process.h>
22100
22101 /* A running thread */
@@ -22184,11 +22184,11 @@
22184 if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
22185 sqlite3_free(p);
22186 return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;
22187 }
22188
22189 #endif /* SQLITE_OS_WIN && !SQLITE_OS_WINRT */
22190 /******************************** End Win32 Threads *************************/
22191
22192
22193 /********************************* Single-Threaded **************************/
22194 #ifndef SQLITE_THREADS_IMPLEMENTED
@@ -33487,11 +33487,15 @@
33487 #endif
33488
33489 #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
33490 DWORD))aSyscall[63].pCurrent)
33491
 
33492 { "WaitForSingleObjectEx", (SYSCALL)WaitForSingleObjectEx, 0 },
 
 
 
33493
33494 #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
33495 BOOL))aSyscall[64].pCurrent)
33496
33497 #if SQLITE_OS_WINRT
@@ -33830,11 +33834,12 @@
33830 #else
33831 osSleep(milliseconds);
33832 #endif
33833 }
33834
33835 #if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
 
33836 SQLITE_PRIVATE DWORD sqlite3Win32Wait(HANDLE hObject){
33837 DWORD rc;
33838 while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
33839 TRUE))==WAIT_IO_COMPLETION ){}
33840 return rc;
@@ -78222,11 +78227,11 @@
78222 if( rc==SQLITE_OK ){
78223 #if SQLITE_MAX_WORKER_THREADS
78224 assert( pSorter->bUseThreads==0 || pSorter->nTask>1 );
78225 if( pSorter->bUseThreads ){
78226 int iTask;
78227 PmaReader *pReadr;
78228 SortSubtask *pLast = &pSorter->aTask[pSorter->nTask-1];
78229 rc = vdbeSortAllocUnpacked(pLast);
78230 if( rc==SQLITE_OK ){
78231 pReadr = (PmaReader*)sqlite3DbMallocZero(db, sizeof(PmaReader));
78232 pSorter->pReader = pReadr;
78233
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -231,11 +231,11 @@
231 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
232 ** [sqlite_version()] and [sqlite_source_id()].
233 */
234 #define SQLITE_VERSION "3.8.7"
235 #define SQLITE_VERSION_NUMBER 3008007
236 #define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
237
238 /*
239 ** CAPI3REF: Run-Time Library Version Numbers
240 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
241 **
@@ -22091,11 +22091,11 @@
22091 #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */
22092 /******************************** End Unix Pthreads *************************/
22093
22094
22095 /********************************* Win32 Threads ****************************/
22096 #if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
22097
22098 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */
22099 #include <process.h>
22100
22101 /* A running thread */
@@ -22184,11 +22184,11 @@
22184 if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
22185 sqlite3_free(p);
22186 return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;
22187 }
22188
22189 #endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */
22190 /******************************** End Win32 Threads *************************/
22191
22192
22193 /********************************* Single-Threaded **************************/
22194 #ifndef SQLITE_THREADS_IMPLEMENTED
@@ -33487,11 +33487,15 @@
33487 #endif
33488
33489 #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
33490 DWORD))aSyscall[63].pCurrent)
33491
33492 #if !SQLITE_OS_WINCE
33493 { "WaitForSingleObjectEx", (SYSCALL)WaitForSingleObjectEx, 0 },
33494 #else
33495 { "WaitForSingleObjectEx", (SYSCALL)0, 0 },
33496 #endif
33497
33498 #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
33499 BOOL))aSyscall[64].pCurrent)
33500
33501 #if SQLITE_OS_WINRT
@@ -33830,11 +33834,12 @@
33834 #else
33835 osSleep(milliseconds);
33836 #endif
33837 }
33838
33839 #if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
33840 SQLITE_THREADSAFE>0
33841 SQLITE_PRIVATE DWORD sqlite3Win32Wait(HANDLE hObject){
33842 DWORD rc;
33843 while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
33844 TRUE))==WAIT_IO_COMPLETION ){}
33845 return rc;
@@ -78222,11 +78227,11 @@
78227 if( rc==SQLITE_OK ){
78228 #if SQLITE_MAX_WORKER_THREADS
78229 assert( pSorter->bUseThreads==0 || pSorter->nTask>1 );
78230 if( pSorter->bUseThreads ){
78231 int iTask;
78232 PmaReader *pReadr = 0;
78233 SortSubtask *pLast = &pSorter->aTask[pSorter->nTask-1];
78234 rc = vdbeSortAllocUnpacked(pLast);
78235 if( rc==SQLITE_OK ){
78236 pReadr = (PmaReader*)sqlite3DbMallocZero(db, sizeof(PmaReader));
78237 pSorter->pReader = pReadr;
78238
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.8.7"
111111
 #define SQLITE_VERSION_NUMBER 3008007
112
-#define SQLITE_SOURCE_ID "2014-10-15 15:28:27 3c1e70f4d55bc009ed9ed4cf6d756d7061985851"
112
+#define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
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.8.7"
111 #define SQLITE_VERSION_NUMBER 3008007
112 #define SQLITE_SOURCE_ID "2014-10-15 15:28:27 3c1e70f4d55bc009ed9ed4cf6d756d7061985851"
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.8.7"
111 #define SQLITE_VERSION_NUMBER 3008007
112 #define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
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