Fix the build of the command-line shell on windows. Windows uses "_pclose"

rather than "pclose" as the pointer to the function that closes a popen pipe.

FossilOrigin-Name: b003b2b2b6ddbfc6ec508b47904e6d095c5f6940

diff --git a/manifest b/manifest
index 6527896fc98c63a3bba2018079a3f80cc1e67d6d..f306a3d59f3d921f4eda75b3c987caa20fea056c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Issue\sthe\snew\sSQLITE_WARNING_AUTOINDEX\swarning\son\sthe\sSQLite\slog\swhenever\nan\sautomatic\sindex\sis\screated.
-D 2013-06-28T23:55:45.243
+C Fix\sthe\sbuild\sof\sthe\scommand-line\sshell\son\swindows.\s\sWindows\suses\s"_pclose"\nrather\sthan\s"pclose"\sas\sthe\spointer\sto\sthe\sfunction\sthat\scloses\sa\spopen\spipe.
+D 2013-06-29T15:40:22.929
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
-F src/shell.c c0f38cee126d1ea82275195933359e91d90196a0
+F src/shell.c 0587c18fd0005c7cec40e6769c6f8b17061873b7
 F src/sqlite.h.in 0a87152a6dde55381afb8f1cf37f337b2f32fd06
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
@@ -1098,7 +1098,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 459b3179023c2c45994ea4acbf34ed5f87cf3c18
-R 48bb56ec2d1aeb5153c2eb54b3cdba3c
+P 338826ef3f8a209b14f8d42370855cab9ac9ed45
+R a5feb81be6db0ace45fe893e87967b80
 U drh
-Z 0e40ede38a5aee19df0cc5e0fb989f8e
+Z 1844d5f1a9688e9a7b52dc56712541f6

diff --git a/manifest.uuid b/manifest.uuid
index 3c40c8f27722a1cced0f1d9b25ea31e79d612d5a..30327c88f7a3501ac475bd19508019572f2aaa33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-338826ef3f8a209b14f8d42370855cab9ac9ed45
\ No newline at end of file
+b003b2b2b6ddbfc6ec508b47904e6d095c5f6940
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 352e31d5111553420a440481869af32fff902707..f9455efc6b4f02bdd6b640763778b95b65b866a6 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -67,7 +67,7 @@
 #undef popen
 #define popen(a,b) _popen((a),(b))
 #undef pclose
-#define pclose(x) _pclose(x)
+#define pclose _pclose
 #else
 /* Make sure isatty() has a prototype.
 */