X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fw32process-unix.c;h=f71dc34bdb758365d5b4d928476d27255c164a97;hb=HEAD;hp=280c3a9213d0a90fd528961ca4c14d878eba7d76;hpb=bf3ac1d7fc45eb32c799e6fb185695c3ee2baef5;p=mono.git diff --git a/mono/metadata/w32process-unix.c b/mono/metadata/w32process-unix.c index 280c3a9213d..f71dc34bdb7 100644 --- a/mono/metadata/w32process-unix.c +++ b/mono/metadata/w32process-unix.c @@ -544,7 +544,7 @@ process_is_alive (pid_t pid) { #if defined(HOST_WATCHOS) return TRUE; // TODO: Rewrite using sysctl -#elif defined(PLATFORM_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(HOST_DARWIN) || defined(__OpenBSD__) || defined(__FreeBSD__) if (pid == 0) return FALSE; if (kill (pid, 0) == 0) @@ -2105,7 +2105,7 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar goto done; } -#ifdef PLATFORM_MACOSX +#ifdef HOST_DARWIN handler = g_strdup ("/usr/bin/open"); #else /* @@ -2580,8 +2580,8 @@ ves_icall_Microsoft_Win32_NativeMethods_GetProcessTimes (gpointer handle, gint64 &start_ticks, &user_ticks, &kernel_ticks); ticks_to_processtime (start_ticks, creation_processtime); - ticks_to_processtime (user_ticks, kernel_processtime); - ticks_to_processtime (kernel_ticks, user_processtime); + ticks_to_processtime (kernel_ticks, kernel_processtime); + ticks_to_processtime (user_ticks, user_processtime); return TRUE; }