diff options
| author | drh <> | 2024-10-22 16:19:14 +0000 |
|---|---|---|
| committer | drh <> | 2024-10-22 16:19:14 +0000 |
| commit | 76e48f4d6648f514a47a4c769c931126da2a7696 (patch) | |
| tree | 6b227a3f1b94aaa40f422942b3a00f42a908b246 | |
| parent | 8f90c664071ac0abc6611c6294570d5890d72e5f (diff) | |
| download | sqlite-76e48f4d6648f514a47a4c769c931126da2a7696.tar.gz sqlite-76e48f4d6648f514a47a4c769c931126da2a7696.zip | |
Do not typedef Tcl_Size if it is already #defined.
FossilOrigin-Name: 53491688cf622ca317b3ff56156e601c2bdfffc94e4fe471ca82d5ba1d9e875f
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/tclsqlite.c | 2 | ||||
| -rw-r--r-- | src/tclsqlite.h | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,5 @@ -C Further\schanges\sto\ssqlite3_rsync.c\sto\swork\saround\sWindows\sissues. -D 2024-10-22T10:29:13.094 +C Do\snot\stypedef\sTcl_Size\sif\sit\sis\salready\s#defined. +D 2024-10-22T16:19:14.101 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -781,8 +781,8 @@ F src/sqliteInt.h baae24292817e13e7fe748851c62efc381dcc4dac241b1182eac3d2f05eae5 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 -F src/tclsqlite.c e2b752dd08034c834e3639afa3300940d6e847fcd94207e1f2f1b83ce08b87be -F src/tclsqlite.h c6af51f31a2b2172d674608763a4b98fdf5cd587e4025053e546fb8077757262 +F src/tclsqlite.c 47d4bb6eb06aab48d643eeb8c4f65b5fa9529fa5526fdcbf223ea32277ed1b56 +F src/tclsqlite.h 529047feec49e7f463374749147f64d3f17505b0ebd84b3477a364c6f46a9de1 F src/test1.c 8bf8b74145b768f42386787f93f6d6dad7bc400a4ee2d50e4ad5a06a20a97ef1 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b @@ -2219,8 +2219,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 67175287440cf363df01bed2464122c3b686a82ea82aeecd3f45fe90c359495c -R 58b5147977291d7ab43e6696ae456e76 +P e2bd3219d9f7bab377ebcfa9a737ca59899c68dad1e3d1d16347bbfdd25652ee +R ca8802466a5e5918921ffde8ccadae70 U drh -Z c3d98da9f482cd0d68ad72a19eedb45b +Z ec07baffb11da349364a8e022541c4d6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e532379d6..36baf2fb8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e2bd3219d9f7bab377ebcfa9a737ca59899c68dad1e3d1d16347bbfdd25652ee +53491688cf622ca317b3ff56156e601c2bdfffc94e4fe471ca82d5ba1d9e875f diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 9ed666951..e572d1d6c 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -47,7 +47,7 @@ /* Compatability between Tcl8.6 and Tcl9.0 */ #if TCL_MAJOR_VERSION==9 # define CONST const -#else +#elif !defined(Tcl_Size) typedef int Tcl_Size; #endif /**** End copy of tclsqlite.h ****/ diff --git a/src/tclsqlite.h b/src/tclsqlite.h index b9a948ef1..9997e4de2 100644 --- a/src/tclsqlite.h +++ b/src/tclsqlite.h @@ -35,7 +35,7 @@ /* Compatability between Tcl8.6 and Tcl9.0 */ #if TCL_MAJOR_VERSION==9 # define CONST const -#else +#elif !defined(Tcl_Size) typedef int Tcl_Size; #endif |