From: mistachkin <mistachkin@noemail.net>
Date: Tue, 9 Jan 2018 00:28:24 +0000 (+0000)
Subject: Improve portability of compile-time MinGW detection for the command line shell.
X-Git-Tag: version-3.22.0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=562f0c8e468a5e0bdd216106f28ca6688cd6ce72;p=thirdparty%2Fsqlite.git

Improve portability of compile-time MinGW detection for the command line shell.

FossilOrigin-Name: 4a7236140cb0f40fa846da4673a0d56218def1929d58cf016909ce881a681140
---

diff --git a/manifest b/manifest
index 4fe1c88833..e191942b43 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2018-01-09T00:26:39.624
+C Improve\sportability\sof\scompile-time\sMinGW\sdetection\sfor\sthe\scommand\sline\sshell.
+D 2018-01-09T00:28:24.035
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 12b6daa4bdb03fa87da27cbc205ff88ace645475b5be79414a3038b68ade14cb
@@ -484,7 +484,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 2aa65d155202d1caf457cb7112ec47d1aded1bc54b20e7f8f7cf81ca1dbb43bf
+F src/shell.c.in fb615970a6ae95be99316d9e4ab14bd2d5c6ecdc15ff905c4107eadfd2e20d0c
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1697,7 +1697,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 7e7e472fa91a2bad2e521d4d67f176c8eb9edc1a07b283e425ea0fa2b6abba1f
-R 1c74e64e0b3c653606aafbb1d2f630fb
+P 1adf4e60391326ba699260402c06604ea25b456e903157ecb05017e7ea954fc4
+R 5655f2550cccb3efdcb36901ceb7ce1e
 U mistachkin
-Z 807ee13ef468838926808e39283b80c4
+Z 83883ba507a74a46a1e753825276cfba
diff --git a/manifest.uuid b/manifest.uuid
index 0267b8f46a..67d4f93659 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1adf4e60391326ba699260402c06604ea25b456e903157ecb05017e7ea954fc4
\ No newline at end of file
+4a7236140cb0f40fa846da4673a0d56218def1929d58cf016909ce881a681140
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index aa92d372ab..8ef236054e 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -76,10 +76,10 @@ typedef unsigned char u8;
 #  include <pwd.h>
 # endif
 #endif
-#if (!defined(_WIN32) && !defined(WIN32)) || defined(__MINGW_H)
+#if (!defined(_WIN32) && !defined(WIN32)) || defined(__MINGW32__)
 # include <unistd.h>
 # include <dirent.h>
-# if defined(__MINGW_H)
+# if defined(__MINGW32__)
 #  define DIRENT dirent
 #  ifndef S_ISLNK
 #   define S_ISLNK(mode) (0)