From afa0ed1f6ec3c0dcea3e6ec61b230dfad5b2513a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 8 Nov 2011 10:42:51 -0800 Subject: [PATCH] unix.process: take raise from unix.ffi And fix introduced ambiguity between unix.ffi:kill and unix.process:kill --- basis/unix/ffi/ffi.factor | 3 --- basis/unix/process/process.factor | 2 ++ basis/unix/signals/signals-tests.factor | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/basis/unix/ffi/ffi.factor b/basis/unix/ffi/ffi.factor index 721efc921b..6798bb1307 100644 --- a/basis/unix/ffi/ffi.factor +++ b/basis/unix/ffi/ffi.factor @@ -168,7 +168,4 @@ FUNCTION: int unlink ( c-string path ) ; FUNCTION: int utimes ( c-string path, timeval[2] times ) ; FUNCTION: ssize_t write ( int fd, void* buf, size_t nbytes ) ; -FUNCTION: int kill ( pid_t pid, int signal ) ; -FUNCTION: int raise ( int signal ) ; - "librt" "librt.so" cdecl add-library diff --git a/basis/unix/process/process.factor b/basis/unix/process/process.factor index cdf3e8222f..7f12c639f8 100644 --- a/basis/unix/process/process.factor +++ b/basis/unix/process/process.factor @@ -40,6 +40,8 @@ FUNCTION: int execve ( c-string path, c-string* argv, c-string* envp ) ; [ fork-process ] 2dip if-zero ; inline FUNCTION: int kill ( pid_t pid, int sig ) ; +FUNCTION: int raise ( int sig ) ; + CONSTANT: PRIO_PROCESS 0 CONSTANT: PRIO_PGRP 1 diff --git a/basis/unix/signals/signals-tests.factor b/basis/unix/signals/signals-tests.factor index 7b57e4994f..bb6164ed09 100644 --- a/basis/unix/signals/signals-tests.factor +++ b/basis/unix/signals/signals-tests.factor @@ -1,5 +1,5 @@ USING: calendar continuations io kernel math namespaces threads -tools.test unix.ffi unix.signals ; +tools.test unix.ffi unix.process unix.signals ; IN: unix.signals.tests SYMBOL: sigusr1-count