diff options
| author | dan <Dan Kennedy> | 2023-12-06 14:30:34 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2023-12-06 14:30:34 +0000 |
| commit | 39b08db132ffcb70a702527cddc8576d43c1103e (patch) | |
| tree | af1807327773487d044856dd55405051435e7be9 /src/sqliteInt.h | |
| parent | fb923fc4ccb79fe27d6daa9477ac2ef55b1da9bc (diff) | |
| parent | 1f2d7c43120fe831fd63f7fedcc61b15a17fccee (diff) | |
| download | sqlite-39b08db132ffcb70a702527cddc8576d43c1103e.tar.gz sqlite-39b08db132ffcb70a702527cddc8576d43c1103e.zip | |
Merge trunk changes into this branch.
FossilOrigin-Name: 8f46eace86e7b2e556913575aa3cd6f7987ac0efcc880f0af649d42c253aeb81
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index bb61cb691..c7ced8699 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2114,11 +2114,11 @@ struct FuncDestructor { #define MFUNCTION(zName, nArg, xPtr, xFunc) \ {nArg, SQLITE_FUNC_BUILTIN|SQLITE_FUNC_CONSTANT|SQLITE_UTF8, \ xPtr, 0, xFunc, 0, 0, 0, #zName, {0} } -#define JFUNCTION(zName, nArg, bUseCache, bWS, bRS, iArg, xFunc) \ +#define JFUNCTION(zName, nArg, bUseCache, bWS, bRS, bJsonB, iArg, xFunc) \ {nArg, SQLITE_FUNC_BUILTIN|SQLITE_DETERMINISTIC|SQLITE_FUNC_CONSTANT|\ SQLITE_UTF8|((bUseCache)*SQLITE_FUNC_RUNONLY)|\ ((bRS)*SQLITE_SUBTYPE)|((bWS)*SQLITE_RESULT_SUBTYPE), \ - SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} } + SQLITE_INT_TO_PTR(iArg|((bJsonB)*JSON_BLOB)),0,xFunc,0, 0, 0, #zName, {0} } #define INLINE_FUNC(zName, nArg, iArg, mFlags) \ {nArg, SQLITE_FUNC_BUILTIN|\ SQLITE_UTF8|SQLITE_FUNC_INLINE|SQLITE_FUNC_CONSTANT|(mFlags), \ @@ -4116,6 +4116,9 @@ struct sqlite3_str { ** ** 3. Make a (read-only) copy of a read-only RCStr string using ** sqlite3RCStrRef(). +** +** "String" is in the name, but an RCStr object can also be used to hold +** binary data. */ struct RCStr { u64 nRCRef; /* Number of references */ |