diff options
| author |  Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-07 16:01:51 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-07 16:01:51 +0100 |
| commit | 59861061f2ab1d3f4b28e83d2dcc3adf0f9acb04 (patch) | |
| tree | d6c4dd1daab916ca1533bb346a79b597eebf8ada /cbits | |
| parent | 98eced86549def54dfb5057ef984a02c720be763 (diff) | |
Tweak execvpe.h hack (see 256b19184bcb) some more
Diffstat (limited to 'cbits')
| -rw-r--r-- | cbits/execvpe.c | 7 | ||||
| -rw-r--r-- | cbits/ghcrts.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cbits/execvpe.c b/cbits/execvpe.c index 9599836..c27bca9 100644 --- a/cbits/execvpe.c +++ b/cbits/execvpe.c @@ -9,12 +9,10 @@ -------------------------------------------------------------------------- */ -#include "execvpe.h" +#include "HsUnixConfig.h" #if HAVE_EXECVPE # define _GNU_SOURCE -#else -# undef execvpe #endif #include <errno.h> @@ -28,6 +26,9 @@ #include <string.h> #include <errno.h> +#define HSUNIX_EXECVPE_H_NO_COMPAT +#include "execvpe.h" + /* * We want the search semantics of execvp, but we want to provide our * own environment, like execve. The following copyright applies to diff --git a/cbits/ghcrts.c b/cbits/ghcrts.c index 1e0dc1c..9003675 100644 --- a/cbits/ghcrts.c +++ b/cbits/ghcrts.c @@ -1,10 +1,11 @@ -#include "execvpe.h" - #ifdef __GLASGOW_HASKELL__ // for 'void StopTimer(void)' prototype # include "Rts.h" #endif +#define HSUNIX_EXECVPE_H_NO_COMPAT +#include "execvpe.h" + /* Copied verbatim from ghc/lib/std/cbits/system.c. */ void pPrPr_disableITimers (void) { |