diff options
| author | drh <drh@noemail.net> | 2015-06-25 15:44:49 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-06-25 15:44:49 +0000 |
| commit | be7d4978365fe110e08ad2ef2f4b09a19f350660 (patch) | |
| tree | 25254824556f89e92cdf22acb98513fc97d7b0d3 /src/shell.c | |
| parent | 5600329bc033aa5837969918d3397e455ee93d51 (diff) | |
| parent | ae6cd723180c7cc880cfb2385f5a24ea0675fd6d (diff) | |
| download | sqlite-be7d4978365fe110e08ad2ef2f4b09a19f350660.tar.gz sqlite-be7d4978365fe110e08ad2ef2f4b09a19f350660.zip | |
Merge all the latest enhancements from trunk.
FossilOrigin-Name: 924f471291dfd458307a11819aa640cc1a02ac63
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/shell.c b/src/shell.c index 746e7229b..175f849b6 100644 --- a/src/shell.c +++ b/src/shell.c @@ -101,28 +101,26 @@ #if defined(_WIN32) || defined(WIN32) # include <io.h> # include <fcntl.h> -#define isatty(h) _isatty(h) -#ifndef access -# define access(f,m) _access((f),(m)) -#endif -#undef popen -#define popen _popen -#undef pclose -#define pclose _pclose -#else -/* Make sure isatty() has a prototype. -*/ -extern int isatty(int); - -#if !defined(__RTP__) && !defined(_WRS_KERNEL) - /* popen and pclose are not C89 functions and so are sometimes omitted from - ** the <stdio.h> header */ - extern FILE *popen(const char*,const char*); - extern int pclose(FILE*); +# define isatty(h) _isatty(h) +# ifndef access +# define access(f,m) _access((f),(m)) +# endif +# undef popen +# define popen _popen +# undef pclose +# define pclose _pclose #else -# define SQLITE_OMIT_POPEN 1 -#endif + /* Make sure isatty() has a prototype. */ + extern int isatty(int); +# if !defined(__RTP__) && !defined(_WRS_KERNEL) + /* popen and pclose are not C89 functions and so are + ** sometimes omitted from the <stdio.h> header */ + extern FILE *popen(const char*,const char*); + extern int pclose(FILE*); +# else +# define SQLITE_OMIT_POPEN 1 +# endif #endif #if defined(_WIN32_WCE) |