os: signal handlers return void.
This commit is contained in:
parent
aa6fbc2a36
commit
843166b033
13
include/os.h
13
include/os.h
|
@ -83,13 +83,6 @@ typedef struct _NewClientRec *NewClientPtr;
|
|||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
/* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */
|
||||
#ifdef SIGNALRETURNSINT
|
||||
#define SIGVAL int
|
||||
#else
|
||||
#define SIGVAL void
|
||||
#endif
|
||||
|
||||
#ifdef DDXOSVERRORF
|
||||
extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
|
||||
#endif
|
||||
|
@ -202,9 +195,9 @@ extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);
|
|||
extern _X_EXPORT void SetScreenSaverTimer(void);
|
||||
extern _X_EXPORT void FreeScreenSaverTimer(void);
|
||||
|
||||
extern _X_EXPORT SIGVAL AutoResetServer(int /*sig*/);
|
||||
extern _X_EXPORT void AutoResetServer(int /*sig*/);
|
||||
|
||||
extern _X_EXPORT SIGVAL GiveUp(int /*sig*/);
|
||||
extern _X_EXPORT void GiveUp(int /*sig*/);
|
||||
|
||||
extern _X_EXPORT void UseMsg(void);
|
||||
|
||||
|
@ -234,7 +227,7 @@ extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va);
|
|||
extern _X_EXPORT char *XNFprintf(const char *fmt, ...);
|
||||
extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va);
|
||||
|
||||
typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */);
|
||||
typedef void (*OsSigHandlerPtr)(int /* sig */);
|
||||
|
||||
extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
|
||||
|
||||
|
|
|
@ -400,8 +400,7 @@ UnlockServer(void)
|
|||
|
||||
/* Force connections to close on SIGHUP from init */
|
||||
|
||||
/*ARGSUSED*/
|
||||
SIGVAL
|
||||
void
|
||||
AutoResetServer (int sig)
|
||||
{
|
||||
int olderrno = errno;
|
||||
|
@ -413,8 +412,7 @@ AutoResetServer (int sig)
|
|||
|
||||
/* Force connections to close and then exit on SIGTERM, SIGINT */
|
||||
|
||||
/*ARGSUSED*/
|
||||
SIGVAL
|
||||
void
|
||||
GiveUp(int sig)
|
||||
{
|
||||
int olderrno = errno;
|
||||
|
|
Loading…
Reference in New Issue