fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-12-27 01:52 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* package/winuni/mpkg_win_uni.nsi
    ! exclude bcc64 parts

  * contrib/3rd/sqlite3/*
  * contrib/3rd/sqlite3/sqlite3.hbp
    ! updated to 3.7.15.1
This commit is contained in:
Viktor Szakats
2012-12-27 00:55:22 +00:00
parent 6b822b4900
commit 5f15aa300f
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog.txt
View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-12-27 01:52 UTC+0100 Viktor Szakats (harbour syenar.net)
* package/winuni/mpkg_win_uni.nsi
! exclude bcc64 parts
* contrib/3rd/sqlite3/*
* contrib/3rd/sqlite3/sqlite3.hbp
! updated to 3.7.15.1
2012-12-19 07:08 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbcurl/core.c
* doc/en/garbage.txt

11
harbour/contrib/3rd/sqlite3/sqlite3.c
View File

@@ -1,6 +1,6 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
** version 3.7.15. By combining all the individual C code files into this
** version 3.7.15.1. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
@@ -673,9 +673,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION "3.7.15"
#define SQLITE_VERSION "3.7.15.1"
#define SQLITE_VERSION_NUMBER 3007015
#define SQLITE_SOURCE_ID "2012-12-12 13:36:53 cd0b37c52658bfdf992b1e3dc467bae1835a94ae"
#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -102865,7 +102865,7 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u8 wtFlags){
pWC->nSlot = sqlite3DbMallocSize(db, pWC->a)/sizeof(pWC->a[0]);
}
pTerm = &pWC->a[idx = pWC->nTerm++];
pTerm->pExpr = p;
pTerm->pExpr = sqlite3ExprSkipCollate(p);
pTerm->wtFlags = wtFlags;
pTerm->pWC = pWC;
pTerm->iParent = -1;
@@ -103650,7 +103650,8 @@ static void exprAnalyze(
}
pTerm = &pWC->a[idxTerm];
pMaskSet = pWC->pMaskSet;
pExpr = sqlite3ExprSkipCollate(pTerm->pExpr);
pExpr = pTerm->pExpr;
assert( pExpr->op!=TK_AS && pExpr->op!=TK_COLLATE );
prereqLeft = exprTableUsage(pMaskSet, pExpr->pLeft);
op = pExpr->op;
if( op==TK_IN ){

4
harbour/contrib/3rd/sqlite3/sqlite3.dif
View File

@@ -1,6 +1,6 @@
diff -urN sqlite3.orig\sqlite3.c sqlite3\sqlite3.c
--- sqlite3.orig\sqlite3.c Sat Dec 15 23:55:32 2012
+++ sqlite3\sqlite3.c Sat Dec 15 23:55:33 2012
--- sqlite3.orig\sqlite3.c Thu Dec 27 01:50:29 2012
+++ sqlite3\sqlite3.c Thu Dec 27 01:50:30 2012
@@ -26421,7 +26421,11 @@
** is the same technique used by glibc to implement posix_fallocate()
** on systems that do not have a real fallocate() system call.

4
harbour/contrib/3rd/sqlite3/sqlite3.h
View File

@@ -107,9 +107,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION "3.7.15"
#define SQLITE_VERSION "3.7.15.1"
#define SQLITE_VERSION_NUMBER 3007015
#define SQLITE_SOURCE_ID "2012-12-12 13:36:53 cd0b37c52658bfdf992b1e3dc467bae1835a94ae"
#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318"
/*
** CAPI3REF: Run-Time Library Version Numbers

4
harbour/contrib/3rd/sqlite3/sqlite3.hbp
View File

@@ -45,8 +45,8 @@
sqlite3.c
# ORIGIN http://www.sqlite.org/
# VER 3.7.15
# URL http://www.sqlite.org/sqlite-amalgamation-3071500.zip
# VER 3.7.15.1
# URL http://www.sqlite.org/sqlite-amalgamation-3071501.zip
# DIFF sqlite3.dif
#
# MAP sqlite3.c

1
harbour/package/winuni/mpkg_win_uni.nsi
View File

@@ -34,6 +34,7 @@ RequestExecutionLevel user
!define PKG_NO_COMP_POCC
!define PKG_NO_COMP_POCC64
!define PKG_NO_COMP_POCCARM
!define PKG_NO_COMP_BCC64
!define /date NOW "%Y%m%d"