diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-31 22:28:11 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-31 22:29:08 -0700 |
commit | 8a3d3a58350506a99efd24f9856466a99bbb9c51 (patch) | |
tree | 39ba091d43312f095586ba7779d234e5983e3970 /src | |
parent | afcad0de54ecd1a8bfaf261e4e6882985a234963 (diff) |
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 <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/twm.c | 5 | ||||
-rw-r--r-- | src/twm.h | 10 |
2 files changed, 3 insertions, 12 deletions
@@ -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; } /** @@ -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 */ |