From 7bad9d7d52d24cc4246646e5af3116c2dd8c25c4 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 6 Dec 2014 21:11:59 +0100 Subject: Have "execvpe.h" provide execvpe() again Turns out `process` reuses `unix`'s execvpe() implementation, and the refactoring in f24ba78f68b2cbc4f4afadc8dd60fc2935357255 broke process. --- include/execvpe.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'include') diff --git a/include/execvpe.h b/include/execvpe.h index 1d49e35..d4b6521 100644 --- a/include/execvpe.h +++ b/include/execvpe.h @@ -4,8 +4,23 @@ Interface for code in cbits/execvpe.c ------------------------------------------------------------------------- */ +#ifndef HSUNIX_EXECVPE_H +#define HSUNIX_EXECVPE_H + +#include "HsUnixConfig.h" + extern int __hsunix_execvpe(const char *name, char *const argv[], char *const envp[]); +// this hack is needed for `process`; to be removed in unix-2.8 +#if HAVE_EXECVPE +# define _GNU_SOURCE +# include +#else +# define execvpe(name,argv,envp) __hsunix_execvpe(name,argv,envp) +#endif + // implemented in cbits/ghcrts.c extern void pPrPr_disableITimers (void); + +#endif -- cgit v1.2.3