Some clean up.

[oota-llvm.git] / tools / llvm-stub / llvm-stub.c

diff --git a/tools/llvm-stub/llvm-stub.c b/tools/llvm-stub/llvm-stub.c
index 931f98a3d569f4bc7332e65daf9f596f792fdb13..10b025633f8a3d9c2401688a47e9ec0972b48be7 100644 (file)
--- a/tools/llvm-stub/llvm-stub.c
+++ b/tools/llvm-stub/llvm-stub.c
@@ -15,7 +15,7 @@
 //
 // This allows the end user to just say ./<program> and have the JIT executed
 // automatically.  On unix, the stub executable emitted is actually a bourne
-// shell script that does the forwarding.  Windows doesn't not like #!/bin/sh
+// shell script that does the forwarding.  Windows does not like #!/bin/sh
 // programs in .exe files, so we make it an actual program, defined here.
 //
 //===----------------------------------------------------------------------===*/
@@ -23,7 +23,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Config/unistd.h"  /* provides definition of execve */
+
+#include "llvm/Config/config.h"
+
+#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+#include <process.h>
+#include <io.h>
+#endif
 
 int main(int argc, char** argv) {
   const char *Interp = getenv("LLVMINTERP");