Fossil SCM
Move some posix only includes so they are not used on _WIN32. Can compile again on MinGW.
Commit
8278a03f0ef162e3dbd8b0b4315ef46eadb64fdf
Parent
5627d795c30186c…
1 file changed
+3
-2
+3
-2
| --- src/popen.c | ||
| +++ src/popen.c | ||
| @@ -17,12 +17,10 @@ | ||
| 17 | 17 | ** |
| 18 | 18 | ** This file contains an implementation of a bi-directional popen(). |
| 19 | 19 | */ |
| 20 | 20 | #include "config.h" |
| 21 | 21 | #include "popen.h" |
| 22 | -#include <signal.h> | |
| 23 | -#include <sys/wait.h> | |
| 24 | 22 | |
| 25 | 23 | #ifdef _WIN32 |
| 26 | 24 | #include <windows.h> |
| 27 | 25 | #include <fcntl.h> |
| 28 | 26 | /* |
| @@ -29,10 +27,13 @@ | ||
| 29 | 27 | ** Print a fatal error and quit. |
| 30 | 28 | */ |
| 31 | 29 | static void win32_fatal_error(const char *zMsg){ |
| 32 | 30 | fossil_fatal("%s", zMsg); |
| 33 | 31 | } |
| 32 | +#else | |
| 33 | +#include <signal.h> | |
| 34 | +#include <sys/wait.h> | |
| 34 | 35 | #endif |
| 35 | 36 | |
| 36 | 37 | /* |
| 37 | 38 | ** The following macros are used to cast pointers to integers and |
| 38 | 39 | ** integers to pointers. The way you do this varies from one compiler |
| 39 | 40 |
| --- src/popen.c | |
| +++ src/popen.c | |
| @@ -17,12 +17,10 @@ | |
| 17 | ** |
| 18 | ** This file contains an implementation of a bi-directional popen(). |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include "popen.h" |
| 22 | #include <signal.h> |
| 23 | #include <sys/wait.h> |
| 24 | |
| 25 | #ifdef _WIN32 |
| 26 | #include <windows.h> |
| 27 | #include <fcntl.h> |
| 28 | /* |
| @@ -29,10 +27,13 @@ | |
| 29 | ** Print a fatal error and quit. |
| 30 | */ |
| 31 | static void win32_fatal_error(const char *zMsg){ |
| 32 | fossil_fatal("%s", zMsg); |
| 33 | } |
| 34 | #endif |
| 35 | |
| 36 | /* |
| 37 | ** The following macros are used to cast pointers to integers and |
| 38 | ** integers to pointers. The way you do this varies from one compiler |
| 39 |
| --- src/popen.c | |
| +++ src/popen.c | |
| @@ -17,12 +17,10 @@ | |
| 17 | ** |
| 18 | ** This file contains an implementation of a bi-directional popen(). |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include "popen.h" |
| 22 | |
| 23 | #ifdef _WIN32 |
| 24 | #include <windows.h> |
| 25 | #include <fcntl.h> |
| 26 | /* |
| @@ -29,10 +27,13 @@ | |
| 27 | ** Print a fatal error and quit. |
| 28 | */ |
| 29 | static void win32_fatal_error(const char *zMsg){ |
| 30 | fossil_fatal("%s", zMsg); |
| 31 | } |
| 32 | #else |
| 33 | #include <signal.h> |
| 34 | #include <sys/wait.h> |
| 35 | #endif |
| 36 | |
| 37 | /* |
| 38 | ** The following macros are used to cast pointers to integers and |
| 39 | ** integers to pointers. The way you do this varies from one compiler |
| 40 |