diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-04 22:01:31 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-04 22:01:31 +0000 |
| commit | bc6f7792f8c5ef6dc6d87ca851c1e182c6a0e418 (patch) | |
| tree | 602066fe46c83df1fa7011890ab00ffb7d3beb5a /src/graph | |
| parent | 92ea008a72331e4095621277305553417b617292 (diff) | |
| download | open-axiom-bc6f7792f8c5ef6dc6d87ca851c1e182c6a0e418.tar.gz | |
* include/bsdsignal.h: Include <signal.h>.
(OPENAXIOM_SIGCHLD): New macro.
* hyper/hyper.c (main): Use OPENAXIOM_SIGCHLD.
* graph/viewman/viewman.c: Don't include <signal.h> directly.
(main): Use OPENAXIOM_SIGCHLD.
* graph/viewman/sselect.c: Don't include <signal.h> directly.
(superSelect): Tidy. Use OPENAXIOM_SIGCHLD.
Diffstat (limited to 'src/graph')
| -rw-r--r-- | src/graph/viewman/sselect.c | 14 | ||||
| -rw-r--r-- | src/graph/viewman/viewman.c | 11 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/graph/viewman/sselect.c b/src/graph/viewman/sselect.c index a9b16528..96516be2 100644 --- a/src/graph/viewman/sselect.c +++ b/src/graph/viewman/sselect.c @@ -40,7 +40,6 @@ #include <errno.h> #include <sys/time.h> #include <sys/wait.h> -#include <signal.h> #include "viewman.h" #include "bsdsignal.h" @@ -61,14 +60,7 @@ *******************************************/ int -#ifdef _NO_PROTO -superSelect(n, rd, wr, ex, timeout) - int n; - int *rd, *wr, *ex; - char *timeout; -#else superSelect(int n, int *rd, int *wr, int *ex, char *timeout) -#endif { int waiting; @@ -89,11 +81,7 @@ superSelect(int n, int *rd, int *wr, int *ex, char *timeout) /* flush(spadSock); */ /* send_int(spadSock,1); acknowledge to spad */ checkClosedChild = no; -#if defined(BSDplatform) || defined(MACOSXplatform) - bsdSignal(SIGCHLD,endChild,DontRestartSystemCalls); -#else - bsdSignal(SIGCLD,endChild,DontRestartSystemCalls); -#endif + bsdSignal(OPENAXIOM_SIGCHLD,endChild,DontRestartSystemCalls); } } ret_val = select(n, (void *)rd, (void *)wr, (void *)ex, (void *)timeout); diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c index aaacef25..96a6e13f 100644 --- a/src/graph/viewman/viewman.c +++ b/src/graph/viewman/viewman.c @@ -41,7 +41,6 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <signal.h> #include "viewman.h" #include "mode.h" #include "actions.h" @@ -86,22 +85,14 @@ char *s1, int -#ifdef _NO_PROTO -main () -#else main (void) -#endif { graphStruct *aGraph; int keepLooking,code; bsdSignal(SIGPIPE,brokenPipe,DontRestartSystemCalls); -#if defined(BSDplatform) || defined (MACOSXplatform) - bsdSignal(SIGCHLD,endChild,RestartSystemCalls); -#else - bsdSignal(SIGCLD,endChild,RestartSystemCalls); -#endif + bsdSignal(OPENAXIOM_SIGCHLD,endChild,RestartSystemCalls); bsdSignal(SIGTERM,goodbye,DontRestartSystemCalls); /* Connect up to AXIOM server */ |