Improve the portability of the src-verify.c tool on Windows.

FossilOrigin-Name: 4068d94acd042a0a9887fba8ba38fa94c6f41a6d3c7a61d5514a57f613b3d278

diff --git a/manifest b/manifest
index fde4e02d92edc363bde49e1149ff6aa22e966eb4..2ce90b977313dc63d4b671ed04be47e44cd14746 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\sin\sfts5\stest\scode.
-D 2023-08-15T14:53:49.203
+C Improve\sthe\sportability\sof\sthe\ssrc-verify.c\stool\son\sWindows.
+D 2023-08-15T18:08:14.939
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2057,7 +2057,7 @@ F tool/sqldiff.c 2a693b4e7c1818c23f871f82f0c3fe67d80b67e3f087893089d33da29c1e387
 F tool/sqlite3_analyzer.c.in f88615bf33098945e0a42f17733f472083d150b58bdaaa5555a7129d0a51621c
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
-F tool/src-verify.c f0cef434a8d8629c4928a02a644fb85e33c8b875a7f2352ba68cc50965a7d213
+F tool/src-verify.c 41c586dee84d0b190ad13e0282ed83d4a65ec9fefde9adf4943efdf6558eea7f
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/stripccomments.c 20b8aabc4694d0d4af5566e42da1f1a03aff057689370326e9269a9ddcffdc37
@@ -2091,8 +2091,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4ae72c896761df5cd37c98ca3eeee7d4c6af3e4ccf74edd88ff902ef38f0765b
-R 713f3f55f713e24450b787462590b16f
-U dan
-Z ea5031f21bcb29fb317be09e8f8e82e0
+P c16ed3b1cc7b4c21bfa96062bf9028ae071c89e63df3b444b59f1753594e4e94
+R d26903aebf24528fd54e9e78adb5fdcf
+U drh
+Z 80466188e3cddbc3741a3a3520958836
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 198539fd3fa0a7cff468ddefc143b2e2e20d1cd3..38ed7e4a702749e87b76e9183b5d1802aa2f553f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c16ed3b1cc7b4c21bfa96062bf9028ae071c89e63df3b444b59f1753594e4e94
\ No newline at end of file
+4068d94acd042a0a9887fba8ba38fa94c6f41a6d3c7a61d5514a57f613b3d278
\ No newline at end of file

diff --git a/tool/src-verify.c b/tool/src-verify.c
index b73a89272a07564d546a52cde73b2e786faa4f33..762904656417f16f303191c9cf38ee91425820d5 100644 (file)
--- a/tool/src-verify.c
+++ b/tool/src-verify.c
@@ -47,8 +47,12 @@
 # include <unistd.h>
 #else
 # include <io.h>
-# define R_OK 04
-# define access(f,m) _access((f),(m))
+# ifndef R_OK
+#   define R_OK 04
+# endif
+# ifndef access
+#   define access(f,m) _access((f),(m))
+# endif
 #endif
 typedef unsigned long long int u64;