Fossil SCM
Re-do part of [d89b99e383], which was lost by [d7736649cd]
Commit
22806c5f59db5b418ab5c351d1d022856e197129
Parent
66f4fa9bd5a5c4b…
1 file changed
+2
+2
| --- src/shell.c | ||
| +++ src/shell.c | ||
| @@ -62,11 +62,13 @@ | ||
| 62 | 62 | |
| 63 | 63 | #if defined(_WIN32) || defined(WIN32) |
| 64 | 64 | # include <io.h> |
| 65 | 65 | #define isatty(h) _isatty(h) |
| 66 | 66 | #define access(f,m) _access((f),(m)) |
| 67 | +#undef popen | |
| 67 | 68 | #define popen(a,b) _popen((a),(b)) |
| 69 | +#undef pclose | |
| 68 | 70 | #define pclose(x) _pclose(x) |
| 69 | 71 | #else |
| 70 | 72 | /* Make sure isatty() has a prototype. |
| 71 | 73 | */ |
| 72 | 74 | extern int isatty(int); |
| 73 | 75 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -62,11 +62,13 @@ | |
| 62 | |
| 63 | #if defined(_WIN32) || defined(WIN32) |
| 64 | # include <io.h> |
| 65 | #define isatty(h) _isatty(h) |
| 66 | #define access(f,m) _access((f),(m)) |
| 67 | #define popen(a,b) _popen((a),(b)) |
| 68 | #define pclose(x) _pclose(x) |
| 69 | #else |
| 70 | /* Make sure isatty() has a prototype. |
| 71 | */ |
| 72 | extern int isatty(int); |
| 73 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -62,11 +62,13 @@ | |
| 62 | |
| 63 | #if defined(_WIN32) || defined(WIN32) |
| 64 | # include <io.h> |
| 65 | #define isatty(h) _isatty(h) |
| 66 | #define access(f,m) _access((f),(m)) |
| 67 | #undef popen |
| 68 | #define popen(a,b) _popen((a),(b)) |
| 69 | #undef pclose |
| 70 | #define pclose(x) _pclose(x) |
| 71 | #else |
| 72 | /* Make sure isatty() has a prototype. |
| 73 | */ |
| 74 | extern int isatty(int); |
| 75 |