From: krasimir <unknown>
Date: Wed, 29 Sep 2004 22:48:07 +0000 (+0000)
Subject: [project @ 2004-09-29 22:48:06 by krasimir]
X-Git-Tag: nhc98-1-18-release~237
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=03ce3451cd857eec90ce7edcf38e1931a1360611;p=ghc-base.git

[project @ 2004-09-29 22:48:06 by krasimir]
compile execvpe only under Unix. The mingw's process.h header also contains
definition for execvpe which conflicts with our definition.
---

diff --git a/cbits/execvpe.c b/cbits/execvpe.c
index f19f9d7..aac5d55 100644
--- a/cbits/execvpe.c
+++ b/cbits/execvpe.c
@@ -1,8 +1,11 @@
 /* -----------------------------------------------------------------------------
    (c) The University of Glasgow 1995-2004
-   
+
    Our low-level exec() variant.
    -------------------------------------------------------------------------- */
+#include "HsBase.h"
+
+#if !defined(mingw32_TARGET_OS) /* to the end */
 
 /* Evidently non-Posix. */
 /* #include "PosixSource.h" */
@@ -13,7 +16,7 @@
 #include <string.h>
 #include <errno.h>
 
-/* 
+/*
  * We want the search semantics of execvp, but we want to provide our
  * own environment, like execve.  The following copyright applies to
  * this code, as it is a derivative of execvp:
@@ -168,3 +171,5 @@ void pPrPr_disableITimers (void)
    setitimer(ITIMER_PROF, &itv, NULL);
 #  endif
 }
+
+#endif
\ No newline at end of file
diff --git a/include/HsBase.h b/include/HsBase.h
index c4f0116..5e7a767 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -127,9 +127,11 @@ void writeErrString__(HsAddr msg, HsInt len);
 /* in Signals.c */
 extern HsInt nocldstop;
 
+#if !defined(mingw32_TARGET_OS)
 /* in execvpe.c */
 extern int execvpe(char *name, char *const argv[], char **envp);
 extern void pPrPr_disableITimers (void);
+#endif
 
 /* -----------------------------------------------------------------------------
    64-bit operations, defined in longlong.c