diff options
| author | mlcreech <mlcreech@noemail.net> | 2008-03-06 09:58:50 +0000 |
|---|---|---|
| committer | mlcreech <mlcreech@noemail.net> | 2008-03-06 09:58:50 +0000 |
| commit | a9e852b667bf61373896a6a89003d27b1cd5bb99 (patch) | |
| tree | e6664ed169388ceb53de37080031422ed725c95f /src/func.c | |
| parent | 7ff4a45e4e715e939f6a149460b5b7a5798448b8 (diff) | |
| download | sqlite-a9e852b667bf61373896a6a89003d27b1cd5bb99.tar.gz sqlite-a9e852b667bf61373896a6a89003d27b1cd5bb99.zip | |
Handle non-autoconf build correctly with new changes (CVS 4832)
FossilOrigin-Name: e2a9f5f1054f077e4773dd3d2c8f2ce5be118a01
Diffstat (limited to 'src/func.c')
| -rw-r--r-- | src/func.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/func.c b/src/func.c index 2c2a1d189..027d8a4fe 100644 --- a/src/func.c +++ b/src/func.c @@ -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 ){ |