Remove the dependency on test_windirent.h from the generated shell.c file.

FossilOrigin-Name: 0a50c9e3bb0dbdaaec819ac6453276ba287b475ea322918ddda1ab3a1ec4b58b

diff --git a/manifest b/manifest
index f28f32250787605864c9b98d45deeb9a7254bd40..68cc1c4a7c529213aa2eff685d8a6859b4fd4327 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\ssqltclsh\sstartup\sscript\sto\slook\sfor\sa\sproperly\sformatted\nSQLAR\sat\sthe\send\sof\sthe\sexecutable.\s\sFix\sthe\sCLI\sso\sthat\sit\sautomatically\nlinks\sagainst\sappendvfs\sand\sso\sthat\sthe\s--append\scommand-line\soption\sworks.
-D 2018-01-07T20:38:10.880
+C Remove\sthe\sdependency\son\stest_windirent.h\sfrom\sthe\sgenerated\sshell.c\sfile.
+D 2018-01-07T21:58:17.629
 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 ffcef0e1b2497b32c13f00ab9a1fececeeeb678dd04f5b17c0b5fa0cc99cd105
+F src/shell.c.in 0e20ac49a6c4458620084bf7715ad39cd9557d9116e447548d2282000e8ca361
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -541,8 +541,8 @@ F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb26
 F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
 F src/test_vfs.c f0186261a24de2671d080bcd8050732f0cb64f6e
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
-F src/test_windirent.c 17f91f5f2aa1bb7328abb49414c363b5d2a9d3ff
-F src/test_windirent.h 5afeb2b1e2920d5149573a4c30a69cba91f2e8a80e00941b738036fca39aca61
+F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1
+F src/test_windirent.h 8782864172ba5ae52c5c313c70faeadb324ff74de9c3dcc6b56a557dccaa1de6
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
@@ -1631,7 +1631,7 @@ F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
 F tool/mkopcodeh.tcl 4ee2a30ccbd900dc4d5cdb61bdab87cd2166cd2affcc78c9cc0b8d22a65b2eee
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
-F tool/mkshellc.tcl 8cb90170e4aed5bd26f1664a83727c5d451f86948d3b759be26c1d7879fa346f
+F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
 F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
@@ -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 c13415c5caf06eaa73086c500907451dfcdfd1354ac4a9ab63edb7255edbfa1b
-R 08ba8efa22e9576ef9e933cfe51a8274
+P 67c4a8c6881e33b830aa27c80e7e3d697a4222939edd77cd5ca77ece16471ea4
+R 197244392d7f5491887179479c1074da
 U drh
-Z 0db18b9089efefc8f8c5c54f23707a0d
+Z 398e4f42db7ae412d7f484f52a78c5ae

diff --git a/manifest.uuid b/manifest.uuid
index ec938d37c04768e3831e846ce100a0b250e268cd..cd48fce8f80dac5596e7f4d14ce1cd616bd7f1b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67c4a8c6881e33b830aa27c80e7e3d697a4222939edd77cd5ca77ece16471ea4
\ No newline at end of file
+0a50c9e3bb0dbdaaec819ac6453276ba287b475ea322918ddda1ab3a1ec4b58b
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 21ad0aea7e4b93e86e7311e21a09f03904aac83d..fe4eb624a1a8153c6c31b1c507834b056736c8d5 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -888,6 +888,7 @@ static void shellAddSchemaName(
 #define SQLITE_EXTENSION_INIT2(X) (void)(X)
 
 #if defined(_WIN32) && defined(_MSC_VER)
+INCLUDE test_windirent.h
 INCLUDE test_windirent.c
 #define dirent DIRENT
 #endif

diff --git a/src/test_windirent.c b/src/test_windirent.c
index ca78d345d946e764a5f11e5652f7b84fb31ec628..62165c4bea5f10ae0c5afc7d92bba0b7e20b3029 100644 (file)
--- a/src/test_windirent.c
+++ b/src/test_windirent.c
@@ -14,7 +14,6 @@
 */
 
 #if defined(_WIN32) && defined(_MSC_VER)
-
 #include "test_windirent.h"
 
 /*

diff --git a/src/test_windirent.h b/src/test_windirent.h
index d4474f80e0f2fa6f36192aab561015ed7f57b7d3..d71b49f68444d8c94a3ebb857e166b9c672d9c74 100644 (file)
--- a/src/test_windirent.h
+++ b/src/test_windirent.h
@@ -13,7 +13,8 @@
 ** POSIX functions on Win32 using the MSVCRT.
 */
 
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(SQLITE_WINDIRENT_H)
+#define SQLITE_WINDIRENT_H
 
 /*
 ** We need several data types from the Windows SDK header.

diff --git a/tool/mkshellc.tcl b/tool/mkshellc.tcl
index 1a98511ef9d1dcfb54c3ae0aca2f07eaa02d2cbd..534ac6156a4e607c3c0bb77b2f5468b9ebe92ef3 100644 (file)
--- a/tool/mkshellc.tcl
+++ b/tool/mkshellc.tcl
@@ -50,6 +50,9 @@ while {1} {
     while {![eof $in2]} {
       set lx [omit_redundant_typedefs [gets $in2]]
       if {[regexp {^#include "sqlite} $lx]} continue
+      if {[regexp {^# *include "test_windirent.h"} $lx]} {
+        set lx "/* $lx */"
+      }
       set lx [string map [list __declspec(dllexport) {}] $lx]
       puts $out $lx
     }