Provide an #ifdef in shell.c to work around issues when cross-compiling

from Ubuntu to windows.

FossilOrigin-Name: 0a3579d9b9d2a60bb85a9811bc7936edb88debae

diff --git a/manifest b/manifest
index 6892cecea2d73820cd819534db6114c39702786f..e1c9e0126133f8125b8f521a2c3cd7dec953df18 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\sbetter\sway\sof\shandling\sthe\sUSE_SYSTEM_SQLITE\s#define\sin\sshell.c.
-D 2014-02-27T15:11:52.919
+C Provide\san\s#ifdef\sin\sshell.c\sto\swork\saround\sissues\swhen\scross-compiling\nfrom\sUbuntu\sto\swindows.
+D 2014-02-28T19:37:45.291
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c ca8b99d894164435f5c55cb304c1b8121705c51e
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 35b07a47fdee9a98e03c4ffb3801026c72114cb7
-F src/shell.c bf75ce6bea4c8f56c1b46bee201c25acddffb675
+F src/shell.c e6d573326f12901df3801777831b48bd80c11dab
 F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1152,7 +1152,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P a6690400235705ecc0d1a60dacff6ad5fb1f944a
-R d9e4cc8c2428822c2a58511d3bd2892d
+P 51ce713c6ee91bdf0126155334dcc800b3daa509
+R f77dc22964f582c1f952cbee70cf06fb
 U drh
-Z 2ca6d024109a270000c3879d5e05ce0a
+Z 5ee6ba31533a91dba4172ad5a5e2ece1

diff --git a/manifest.uuid b/manifest.uuid
index 5a0d8578c1994ded43f5774235bb39fa5f814a68..297558a6f1a05ec6522941a37dd231cfd69abbfa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51ce713c6ee91bdf0126155334dcc800b3daa509
\ No newline at end of file
+0a3579d9b9d2a60bb85a9811bc7936edb88debae
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 6815c489e65e8951ea06d8ea826b87f1839e5ee1..0709f6c41e3cc22c887d57d4df7a7302dc91af5d 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -65,7 +65,9 @@
 #if defined(_WIN32) || defined(WIN32)
 # include <io.h>
 #define isatty(h) _isatty(h)
-#define access(f,m) _access((f),(m))
+#ifndef access
+# define access(f,m) _access((f),(m))
+#endif
 #undef popen
 #define popen _popen
 #undef pclose