mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
Get rid of support of ancient signal handler return type int
Such environments are missing void type, older K&R C, and such supports already had been removed in various places. Furthermore, current hardcoded 'SIGNALRETURNSINT' is wrong.
This commit is contained in:
parent
3e81d4c4de
commit
692771fb07
5 changed files with 4 additions and 24 deletions
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
bin_PROGRAMS = ttauth
|
||||
|
||||
ttauth_CFLAGS = -I../../slib -I../../lib -DSIGNALRETURNSINT
|
||||
ttauth_CFLAGS = -I../../slib -I../../lib
|
||||
|
||||
ttauth_LDADD = @LIBTT@ $(X_LIBS)
|
||||
|
||||
|
|
|
@ -478,25 +478,16 @@ static Bool ttauth_allowed = True; /* if allowed to write auth file */
|
|||
static char *ttauth_filename = NULL;
|
||||
static Bool dieing = False;
|
||||
|
||||
#ifdef SIGNALRETURNSINT
|
||||
#define _signal_t int
|
||||
#else
|
||||
#define _signal_t void
|
||||
#endif
|
||||
|
||||
/* ARGSUSED */
|
||||
static _signal_t
|
||||
static void
|
||||
die(int sig)
|
||||
{
|
||||
dieing = True;
|
||||
exit (auth_finalize ());
|
||||
/* NOTREACHED */
|
||||
#ifdef SIGNALRETURNSINT
|
||||
return -1; /* for picky compilers */
|
||||
#endif
|
||||
}
|
||||
|
||||
static _signal_t
|
||||
static void
|
||||
catchsig(int sig)
|
||||
{
|
||||
#ifdef SYSV
|
||||
|
@ -505,9 +496,6 @@ catchsig(int sig)
|
|||
if (verbose && ttauth_modified) printf ("\r\n");
|
||||
die (sig);
|
||||
/* NOTREACHED */
|
||||
#ifdef SIGNALRETURNSINT
|
||||
return -1; /* for picky compilers */
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -39,7 +39,7 @@ libresource_a_CFLAGS = $(AM_CFLAGS) \
|
|||
-DDEF_SESSION=\"$(CDE_INSTALLATION_TOP)/bin/Xsession\" \
|
||||
-DDEF_SYSTEM_SHELL=\"/bin/sh\" \
|
||||
-DDEF_CHOOSER=\"$(CDE_INSTALLATION_TOP)/bin/dtchooser\" \
|
||||
-DDEF_XDM_CONFIG=\"Xconfig\" -DSIGNALRETURNSINT \
|
||||
-DDEF_XDM_CONFIG=\"Xconfig\" \
|
||||
-DDEF_SERVER_LINE=\"":0 Local local $(DEF_SERVER) :0"\" \
|
||||
-DXRDB_PROGRAM=\"$(XRDB)\" \
|
||||
-DDEF_USER_PATH=\"$(DEF_USER_PATH)\" \
|
||||
|
|
|
@ -161,11 +161,7 @@
|
|||
/* Utmp rec prefix */
|
||||
#define UTMPREC_PREFIX "dt"
|
||||
|
||||
#ifdef SIGNALRETURNSINT
|
||||
#define SIGVAL int
|
||||
#else
|
||||
#define SIGVAL void
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef UID_NO_CHANGE
|
||||
|
|
|
@ -70,11 +70,7 @@ extern int errno;
|
|||
# include <DtXinerama.h>
|
||||
#endif
|
||||
|
||||
#ifdef SIGNALRETURNSINT
|
||||
#define SIGVAL int
|
||||
#else
|
||||
#define SIGVAL void
|
||||
#endif
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
|
|
Loading…
Reference in a new issue