Add to #undef statements to the command-line shell, go make sure that the

macros definitions that follow do not collide with system definitions.

FossilOrigin-Name: 24420d6d2077d745cc26dd269e76b48c8a3eeb3c

diff --git a/manifest b/manifest
index 1fb35a2d74d7bcf687e559cb4e604cfb2f688d7f..d3c4630ea29f4bb8cc67f789e1aa90dc8cf52849 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert\sin\sthe\svirtual\stable\slogic\s-\sit\scould\sfire\sfollowing\nan\sI/O\serror\safter\ssqlite3_close_v2()\swas\sadded.
-D 2012-08-27T14:39:47.359
+C Add\sto\s#undef\sstatements\sto\sthe\scommand-line\sshell,\sgo\smake\ssure\sthat\sthe\nmacros\sdefinitions\sthat\sfollow\sdo\snot\scollide\swith\ssystem\sdefinitions.
+D 2012-08-27T21:19:03.083
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -177,7 +177,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 7c62350de1d619d058030f8dc2b11a95cfde77ac
-F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
+F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
 F src/sqlite.h.in b20d50c7efe592aa9420386937c26fe8efd9e0d1
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8
@@ -1013,7 +1013,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 9b19b847533f944f289d93dcdba29c0d67bf251c
-R 82ed09528ad5e2b2f9698e3182c607ef
+P 4ccc18e999c51f7f6637ee48ccca35c7706bfe6d
+R 740204f7686a3b17a40ffeda3efe6cd4
 U drh
-Z 34bc59f1ddfbd35ac1cc9f60ac6109f9
+Z 48561ad81823df9fc82c051aa08e231e

diff --git a/manifest.uuid b/manifest.uuid
index 3077044ec4eff96977312116292726d02e3861a5..e7779398bf25f8d59670773da6e62290bc12dcaf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ccc18e999c51f7f6637ee48ccca35c7706bfe6d
\ No newline at end of file
+24420d6d2077d745cc26dd269e76b48c8a3eeb3c
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index baedcceb599935f0d436a9b4035f4edc86381dad..a17d966245c15a0183df882518283fef263c505d 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -64,7 +64,9 @@
 # include <io.h>
 #define isatty(h) _isatty(h)
 #define access(f,m) _access((f),(m))
+#undef popen
 #define popen(a,b) _popen((a),(b))
+#undef pclose
 #define pclose(x) _pclose(x)
 #else
 /* Make sure isatty() has a prototype.