diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2013-12-17 11:28:21 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2013-12-17 11:28:21 -0500 |
| commit | 24b3001f0d857fa40225efc1db169b29e88b4b4d (patch) | |
| tree | b2f6257b665f7453ff6331596e563230b1b024f4 /lisp | |
| parent | 505fc48999ca2c7040a47900697d95c6ab78d009 (diff) | |
Remove obsolete Imake SIGNALRETURNSINT
Assume signal handlers return void, as C89 requires
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/lisp.c | 15 | ||||
| -rw-r--r-- | lisp/private.h | 5 | ||||
| -rw-r--r-- | lisp/xedit.c | 14 |
3 files changed, 2 insertions, 32 deletions
diff --git a/lisp/lisp.c b/lisp/lisp.c index 206c038..411240a 100644 --- a/lisp/lisp.c +++ b/lisp/lisp.c @@ -158,13 +158,7 @@ static INLINE void LispProt(LispObj*); static LispObj *LispCheckNeedProtect(LispObj*); -static -#ifdef SIGNALRETURNSINT -int -#else -void -#endif -LispSignalHandler(int); +static void LispSignalHandler(int); /* * Initialization @@ -5009,17 +5003,10 @@ LispUpdateResults(LispObj *cod, LispObj *res) LispSetVar(RES[0], res); } -#ifdef SIGNALRETURNSINT -int -#else void -#endif LispSignalHandler(int signum) { LispSignal(signum); -#ifdef SIGNALRETURNSINT - return (0); -#endif } void diff --git a/lisp/private.h b/lisp/private.h index ef44ab2..2e5b634 100644 --- a/lisp/private.h +++ b/lisp/private.h @@ -388,13 +388,8 @@ struct _LispMac { #endif LispObj *prolist; /* protect objects list */ -#ifdef SIGNALRETURNSINT - int (*sigint)(int); - int (*sigfpe)(int); -#else void (*sigint)(int); void (*sigfpe)(int); -#endif int destroyed; /* reached LispDestroy, used by unwind-protect */ int running; /* there is somewhere to siglongjmp */ diff --git a/lisp/xedit.c b/lisp/xedit.c index a337912..8f191dc 100644 --- a/lisp/xedit.c +++ b/lisp/xedit.c @@ -98,11 +98,7 @@ static LispObj *XeditSearch(LispBuiltin*, XawTextScanDirection); /* * Initialization */ -#ifdef SIGNALRETURNSINT -static int (*old_sigalrm)(int); -#else static void (*old_sigalrm)(int); -#endif EditModeInfo *mode_infos; Cardinal num_mode_infos; @@ -177,12 +173,7 @@ ControlGPredicate(Display *display, XEvent *event, XPointer arguments) } /*ARGSUSED*/ -static -#ifdef SIGNALRETURNSINT -int -#else -void -#endif +static void SigalrmHandler(int signum) { XEvent event; @@ -201,9 +192,6 @@ SigalrmHandler(int signum) } else alarm(1); -#ifdef SIGNALRETURNSINT - return (0); -#endif } static ssize_t |