MinGW does not define the S_ISLNK macro; therefore, define it in the shell when needed.

FossilOrigin-Name: 73023febbe57495a22db05904bd6ddff439d6c25970cbe87e0ba4a923f3e8a29

diff --git a/manifest b/manifest
index b645c837cd8b8fa9bc7421f6d847d940402b9455..bbcb9ab663c617fbc17747aa2beea42a9c48cfdb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Skip\srunning\sthe\s'zipfile'\stest\sif\sthe\snecessary\sstatic\spackage\scannot\sbe\sloaded.
-D 2018-01-05T20:13:33.577
+C MinGW\sdoes\snot\sdefine\sthe\sS_ISLNK\smacro;\stherefore,\sdefine\sit\sin\sthe\sshell\swhen\sneeded.
+D 2018-01-05T20:26:06.480
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in c4a9842dcd07572a106da739fa4f76d5ae228e3c4c40c859c84ceaa71c36348e
@@ -483,7 +483,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
-F src/shell.c.in 54b689b5c4301c77c27cb74030387a8fa311ca8e419efde97c32368447496adf
+F src/shell.c.in df0e5728a6b41c676f0bb55716ca317081eba5e741ba45e513c842c4533bda58
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1694,7 +1694,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dfe510b51046a53c7f5c54fe73ec9de3364923eabd4b909c11984552e6bea406
-R 77b0d484d37ac0b70535216ad42f574c
+P 5bc816ec4010c20407396a1051e9f9b0a360ca27c0a99dafa867225cf974e306
+R 1b1f2c1c694e2046fcfe9404f479b19a
 U mistachkin
-Z 2a7cfd5e6817597b58865e4e49810899
+Z 8141067c4aab566b846a47904d7a2b0b

diff --git a/manifest.uuid b/manifest.uuid
index 325fc3f2c313755852315b8a40d3f51ac6bca9f0..c2654be9bec8d01c5939db4f620569ba622b92e5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bc816ec4010c20407396a1051e9f9b0a360ca27c0a99dafa867225cf974e306
\ No newline at end of file
+73023febbe57495a22db05904bd6ddff439d6c25970cbe87e0ba4a923f3e8a29
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 691e7750ad2158cb3e7e0906d064f5c50827d8fa..832450fea7a44a563f88938fc0d2daccdd6cdef9 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -78,6 +78,9 @@
 # include <dirent.h>
 # if defined(__MINGW_H)
 #  define DIRENT dirent
+#  ifndef S_ISLNK
+#   define S_ISLNK(mode) (0)
+#  endif
 # endif
 #endif
 #include <sys/types.h>