From a734793b2f45a1fda96d96af51644256b0ada406 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 24 Oct 2024 17:16:38 +0000 Subject: [PATCH] Fix a bug in jimsh0.c for when it is compiled using MSVC. FossilOrigin-Name: f7def0be742fad9863f1eba11d0c2f1fa739ad1262e67d24380698e3948cedb7 --- autosetup/jimsh0.c | 1 + manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c index b7496de7b6..ca4912f95a 100644 --- a/autosetup/jimsh0.c +++ b/autosetup/jimsh0.c @@ -96,6 +96,7 @@ char *dlerror(void); #include #define jim_wide _int64 +#define HAVE_LONG_LONG 1 #ifndef LLONG_MAX #define LLONG_MAX 9223372036854775807I64 #endif diff --git a/manifest b/manifest index 79a7a534e8..102db05a8c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\snew\stool/cp.tcl\sso\sthat\sit\sworks\swith\solder\sTCL\sversions,\ssuch\sas\njimtcl. -D 2024-10-24T15:57:21.801 +C Fix\sa\sbug\sin\sjimsh0.c\sfor\swhen\sit\sis\scompiled\susing\sMSVC. +D 2024-10-24T17:16:38.986 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -48,7 +48,7 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82 F autosetup/hwaci-common.tcl 3513a7dbe685d4776e70d23fa41d6695098627ca063245cac163f8ed3dc696f9 -F autosetup/jimsh0.c 0b29699d873c54127873b0906be501f63dacdd1abc76a209d59a6c7e30c579a0 +F autosetup/jimsh0.c eb49d62a5b28b4d3b2af10cdfa5dc972ed76e8474fd773cdc7266e768c746f6d F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f @@ -2237,8 +2237,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 7e7b3b2edbb580c9ac14f21e5caa8f2f6b171d9a7ce6cb336dc0c8db76da7e8c -R 25a1f3ca2528827073938adc0aff88af +P 61f18c96183867fe9d0fb30b8b71c0253f40503e32c8a4202196fb6418f2f46e +R 3fcda85ce8cde0358524e6ceb13906f8 U drh -Z 71442e5bb903956a92a03709a3f05ed9 +Z 9f3b8d43e2772874f53939ba0a89ce88 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 378c0e325a..7f419644f7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -61f18c96183867fe9d0fb30b8b71c0253f40503e32c8a4202196fb6418f2f46e +f7def0be742fad9863f1eba11d0c2f1fa739ad1262e67d24380698e3948cedb7