From b8eb2486b15d564e73ef9307e175ac24a186acd2 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Mon, 30 Jul 2018 14:38:30 +0300
Subject: [PATCH] Remove HSUNIX_EXECVPE_H_NO_COMPAT hack
Now we can finally remove the hack introduced via
59861061f2ab1d3f4b28e83d2dcc3adf0f9acb04
256b19184bcb05c3cd9a6061730b7d67d61c0763
7bad9d7d52d24cc4246646e5af3116c2dd8c25c4
Co-authored-by: Herbert Valerio Riedel <hvr@gnu.org>
---
cbits/execvpe.c | 1 -
changelog.md | 2 ++
include/execvpe.h | 12 ------------
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/cbits/execvpe.c b/cbits/execvpe.c
index 708b8b2..9af3acc 100644
--- a/cbits/execvpe.c
+++ b/cbits/execvpe.c
@@ -22,7 +22,6 @@
#include <string.h>
#include <errno.h>
-#define HSUNIX_EXECVPE_H_NO_COMPAT
#include "execvpe.h"
#if !defined(execvpe) && !HAVE_DECL_EXECVPE
diff --git a/changelog.md b/changelog.md
index 617607f..6624129 100644
--- a/changelog.md
+++ b/changelog.md
@@ -15,6 +15,8 @@
which now must be passed as part of `OpenFileFlags`
(e.g. `defaultFileFlags { creat = Just mode }`) (#58)
+ * Remove deprecated `execvpe(3)` legacy-emulation CPP macro
+
## 2.7.2.2 *May 2017*
* Bundled with GHC 8.2.1
diff --git a/include/execvpe.h b/include/execvpe.h
index 8db9495..bfc7eb9 100644
--- a/include/execvpe.h
+++ b/include/execvpe.h
@@ -10,16 +10,4 @@
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
-#ifndef HSUNIX_EXECVPE_H_NO_COMPAT
-#include "HsUnixConfig.h"
-#if HAVE_EXECVPE
-# include <unistd.h>
-extern int
-execvpe(const char *name, char *const argv[], char *const envp[]);
-#else
-# define execvpe(name,argv,envp) __hsunix_execvpe(name,argv,envp)
-#endif
-#endif
-
#endif
--
GitLab