database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-24 09:53:10 +03:00
Code Activity

Handle non-autoconf build correctly with new changes (CVS 4832)

Browse Source 
FossilOrigin-Name: e2a9f5f1054f077e4773dd3d2c8f2ce5be118a01
This commit is contained in:
mlcreech
2008-03-06 09:58:50 +00:00
parent 7ff4a45e4e
commit a9e852b667
13 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/func.c
View File

@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
** $Id: func.c,v 1.185 2008/03/06 07:35:22 mlcreech Exp $
** $Id: func.c,v 1.186 2008/03/06 09:58:50 mlcreech Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -875,7 +875,7 @@ static void trimFunc(
const unsigned char *zIn; /* Input string */
const unsigned char *zCharSet; /* Set of characters to trim */
int nIn; /* Number of bytes in input */
intptr_t flags; /* 1: trimleft 2: trimright 3: trim */
sqlite3_intptr_t flags; /* 1: trimleft 2: trimright 3: trim */
int i; /* Loop counter */
unsigned char *aLen; /* Length of each character in zCharSet */
unsigned char **azChar; /* Individual characters in zCharSet */
@@ -916,7 +916,7 @@ static void trimFunc(
}
}
if( nChar>0 ){
flags = (intptr_t)sqlite3_user_data(context);
flags = (sqlite3_intptr_t)sqlite3_user_data(context);
if( flags & 1 ){
while( nIn>0 ){
int len;
@@ -1459,7 +1459,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
if( argType==0xff ){
pArg = db;
}else{
pArg = (void*)(intptr_t)argType;
pArg = (void*)(sqlite3_intptr_t)argType;
}
sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg,
aFuncs[i].eTextRep, pArg, aFuncs[i].xFunc, 0, 0);
@@ -1478,7 +1478,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
sqlite3AttachFunctions(db);
#endif
for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){
void *pArg = (void*)(intptr_t)aAggs[i].argType;
void *pArg = (void*)(sqlite3_intptr_t)aAggs[i].argType;
sqlite3CreateFunc(db, aAggs[i].zName, aAggs[i].nArg, SQLITE_UTF8,
pArg, 0, aAggs[i].xStep, aAggs[i].xFinalize);
if( aAggs[i].needCollSeq ){