From 8a3d3a58350506a99efd24f9856466a99bbb9c51 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 31 Jul 2013 22:28:11 -0700 Subject: Assume C89 signal handlers, returning void Removes old #ifdef SIGNALRETURNSINT check that was never defined in autoconf builds, only old Imake builds. Signed-off-by: Alan Coopersmith --- src/twm.c | 5 ++--- src/twm.h | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/twm.c b/src/twm.c index e7791da..12f8ca1 100644 --- a/src/twm.c +++ b/src/twm.c @@ -107,7 +107,7 @@ static Bool PrintErrorMessages = False; /* controls error messages */ static int RedirectError; /* TRUE ==> another window manager running */ static int TwmErrorHandler ( Display *dpy, XErrorEvent *event ); /* for settting RedirectError */ static int CatchRedirectError ( Display *dpy, XErrorEvent *event ); /* for everything else */ -static SIGNAL_T sigHandler(int); +static void sigHandler(int); char Info[INFO_LINES][INFO_SIZE]; /* info strings to print */ int InfoLines; static char *InitFile = NULL; @@ -917,11 +917,10 @@ Reborder (Time time) SetFocus ((TwmWindow*)NULL, time); } -static SIGNAL_T +static void sigHandler(int sig) { XtNoticeSignal(si); - SIGNAL_RETURN; } /** diff --git a/src/twm.h b/src/twm.h index 2d76ef0..aa5f16d 100644 --- a/src/twm.h +++ b/src/twm.h @@ -80,15 +80,7 @@ from The Open Group. #define PIXEL_ALREADY_TYPEDEFED /* for Xmu/Drawing.h */ -#ifdef SIGNALRETURNSINT -#define SIGNAL_T int -#define SIGNAL_RETURN return 0 -#else -#define SIGNAL_T void -#define SIGNAL_RETURN return -#endif - -typedef SIGNAL_T (*SigProc)(int); /* type of function returned by signal() */ +typedef void (*SigProc)(int); /* type of function returned by signal() */ #define BW 2 /* border width */ #define BW2 4 /* border width * 2 */ -- cgit v1.2.3