From 457683c7feef42f07f3044ccfdc8ee7816176ab0 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Thu, 20 Oct 2011 12:32:43 +0200 Subject: Do not pass taskpointers to "rust" native functions Issue #466 --- src/rt/rust_run_program.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/rt/rust_run_program.cpp') diff --git a/src/rt/rust_run_program.cpp b/src/rt/rust_run_program.cpp index 86fd9963b9d..1b17a510b2e 100644 --- a/src/rt/rust_run_program.cpp +++ b/src/rt/rust_run_program.cpp @@ -6,8 +6,7 @@ #include extern "C" CDECL int -rust_run_program(void* task, const char* argv[], - int in_fd, int out_fd, int err_fd) { +rust_run_program(const char* argv[], int in_fd, int out_fd, int err_fd) { STARTUPINFO si; ZeroMemory(&si, sizeof(STARTUPINFO)); si.cb = sizeof(STARTUPINFO); @@ -54,7 +53,7 @@ rust_run_program(void* task, const char* argv[], } extern "C" CDECL int -rust_process_wait(void* task, int proc) { +rust_process_wait(int proc) { DWORD status; while (true) { if (GetExitCodeProcess((HANDLE)proc, &status) && @@ -73,8 +72,7 @@ rust_process_wait(void* task, int proc) { #include extern "C" CDECL int -rust_run_program(rust_task* task, char* argv[], - int in_fd, int out_fd, int err_fd) { +rust_run_program(char* argv[], int in_fd, int out_fd, int err_fd) { int pid = fork(); if (pid != 0) return pid; @@ -92,7 +90,7 @@ rust_run_program(rust_task* task, char* argv[], } extern "C" CDECL int -rust_process_wait(void* task, int proc) { +rust_process_wait(int proc) { // FIXME: stub; exists to placate linker. return 0; } -- cgit 1.4.1-3-g733a5