diff options
| -rw-r--r-- | include/dm.h | 4 | ||||
| -rw-r--r-- | xdm/dm.c | 11 | ||||
| -rw-r--r-- | xdm/server.c | 2 | ||||
| -rw-r--r-- | xdm/session.c | 9 |
4 files changed, 11 insertions, 15 deletions
diff --git a/include/dm.h b/include/dm.h index a524bd9..cdb214f 100644 --- a/include/dm.h +++ b/include/dm.h @@ -357,14 +357,12 @@ extern void WaitForChild (void); # include <stdlib.h> -# define SIGVAL RETSIGTYPE - # define Setjmp(e) sigsetjmp(e,1) # define Longjmp(e,v) siglongjmp(e,v) # define Jmp_buf sigjmp_buf -typedef SIGVAL (*SIGFUNC)(int); +typedef void (*SIGFUNC)(int); #endif /* _DM_H_ */ @@ -48,10 +48,9 @@ from The Open Group. #include <stdint.h> #include <unistd.h> - #include <syslog.h> -static SIGVAL StopAll (int n), RescanNotify (int n); +static void StopAll (int n), RescanNotify (int n); static void RescanServers (void); static void RestartDisplay (struct display *d, int forceReserver); static void ScanServers (void); @@ -63,7 +62,7 @@ static long ServersModTime, ConfigModTime; int nofork_session = 0; -static SIGVAL ChildNotify (int n); +static void ChildNotify (int n); static pid_t parent_pid = -1; /* PID of parent xdm process */ @@ -141,7 +140,7 @@ main (int argc, char **argv) } /* ARGSUSED */ -static SIGVAL +static void RescanNotify (int n) { int olderrno = errno; @@ -255,7 +254,7 @@ RescanIfMod (void) */ /* ARGSUSED */ -static SIGVAL +static void StopAll (int n) { int olderrno = errno; @@ -289,7 +288,7 @@ StopAll (int n) int ChildReady; /* ARGSUSED */ -static SIGVAL +static void ChildNotify (int n) { int olderrno = errno; diff --git a/xdm/server.c b/xdm/server.c index e69c2f7..c7bef40 100644 --- a/xdm/server.c +++ b/xdm/server.c @@ -50,7 +50,7 @@ static int receivedUsr1; static int serverPause (unsigned t, pid_t serverPid); /* ARGSUSED */ -static SIGVAL +static void CatchUsr1 (int n) { int olderrno = errno; diff --git a/xdm/session.c b/xdm/session.c index ff167f7..3897533 100644 --- a/xdm/session.c +++ b/xdm/session.c @@ -98,16 +98,16 @@ static struct verify_info verify; static int abortSession = 0; /* ARGSUSED */ -static SIGVAL +static void catchTerm (int n) { abortSession++; } static int childDied = 0; -static SIGVAL catchChld(int n); +static void catchChld(int n); -static SIGVAL +static void catchChld(int n) { childDied++; @@ -118,7 +118,7 @@ AbortClient (pid_t pid) { int sig = SIGTERM; volatile int i; - SIGVAL (*old)(int); + void (*old)(int); pid_t retId; LogInfo("AbortClient\n"); @@ -273,7 +273,6 @@ DeleteXloginResources (struct display *d, Display *dpy) } } - void SecureDisplay (struct display *d, Display *dpy) { |